Michael Niedermayer
040a796dab
Merge commit '755cd4197d53946208e042f095b930dca18d9430'
...
* commit '755cd4197d53946208e042f095b930dca18d9430':
mov: enable parsing for VC-1.
lavfi: Add fps filter.
lavfi: initialize pts to AV_NOPTS_VALUE when creating new buffer refs.
avconv: add support for audio in complex filtergraphs.
Conflicts:
ffmpeg.c
libavfilter/version.h
libavformat/mov.c
tests/ref/fate/vc1-ism
Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Carl Eugen Hoyos
612abe2773
Use a variable instead of a repeated calculation when decoding AVUI.
13 years ago
Carl Eugen Hoyos
f1892348c2
avuidec.c: Fix indentation.
13 years ago
Carl Eugen Hoyos
d9b2410f75
Simplify AVUI decoding, one skip value is enough.
13 years ago
Carl Eugen Hoyos
2596d7261d
Fix interlaced AVUI decoding.
13 years ago
Michael Niedermayer
9d30a96aa1
ffmpeg: inject a aresample filter for -async
...
Based on similar code from anton
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
21d8a80e30
af_aresample: use new swr API to pass and compensate PTS
...
This code is not only much more powerfull its also simpler
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
087d09b6d5
af_aresample: allocate a larger buffer so accumulated data can be returned quicker
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
e17a039647
af_aresample: use extended_data
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
72a242c998
swr: add swr_next_pts()
...
parameter descriptions partly reuse text from af_asyncts
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
f88f705abc
swr: add swr_drop_output()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
7a59964ba9
swr: add swr_inject_silence()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
72872d0201
swr: Fix issue with injecting more data than can be used up in the next call.
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
c5c355546d
swr: add some asserts to resample()
...
These check that the internal and input buffers match in format
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
75e25f8540
swr: add reversefill_audiodata()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
5027e3daf7
swr: fix buf_set() so it works with input == output
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
bdbfd4569d
swr: make literal 32 a named constant in realloc_audio()
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
186be49fd5
swr: fill_audio_data() support NULL
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Nicolas George
3d2515a8f3
f_split: fix output type.
...
The previous version checked the filter context name,
instead of checking the filter name.
The new version just uses the same type as the input.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
13 years ago
Nicolas George
5ac9ef6493
avfilter: make AVFilterFormats compatible with libav.
...
The list goes back to being simple integers,
and avfilter_make_format64_list is fixed to work
with the correct structure directly.
13 years ago
Stefano Sabatini
0e82d317eb
lavfi: rename vf_split.c -> f_split.c
...
The file now contains both an audio and a video split filter.
13 years ago
Stefano Sabatini
150227e8ed
lavfi/asplit: move asplit code to vf_split.c, and make it support N outputs
...
The move allows to share the init code already used by split.
13 years ago
Clément Bœsch
e5fcf3646a
lavf/id3v2: always strdup the value.
...
This simplifies the code but also fix a warning: ff_id3v1_genre_str
array contains const strings so do the string dup now instead of in
av_dict_set().
13 years ago
Clément Bœsch
6ad974ae1c
lavf/id3v2: do not export empty fields.
...
This also avoids a memleak.
13 years ago
Clément Bœsch
4fd573970a
doc/examples: make use of the parameter filters_descr parameter in init_filters().
13 years ago
Clément Bœsch
0cc9ee5fab
doc/examples: install them with the shared data.
13 years ago
Clément Bœsch
e692b9d564
doc/examples: fix pts heuristic in filtering_video.
...
Note: the condition looked wrong in the first place ("if DTS is not
defined, then set PTS to that undefined value [...]").
13 years ago
Clément Bœsch
60ea6b0996
lavfi/buffersink: typo fix in a comment.
13 years ago
Clément Bœsch
5e82ec9b42
doc/examples: properly close input in metadata.
...
Avoid some memleaks.
13 years ago
Clément Bœsch
50df68fd50
doc/examples: print operation filename in decoding_encoding.
13 years ago
Clément Bœsch
c6bbe3c2a7
doc/examples: add debug compilation flag.
13 years ago
Clément Bœsch
06e4b98382
build: remove non-existant examples rule.
13 years ago
Clément Bœsch
6c211085bb
doc/examples: use system headers in decoding_encoding and muxing.
...
All the other examples already use the system installed headers.
13 years ago
Clément Bœsch
136ca0e5f8
doc/examples: remove explicit rules.
...
These rules are already in gmake builtins.
13 years ago
Clément Bœsch
7aedfeebfb
doc/examples: add libavr to libraries to avoid link failures.
13 years ago
Clément Bœsch
eb945ab484
ffmpeg: misc cosmetics.
...
Reduce diff against avconv, and change some doxycomments into normal
comments (no point in doxifying ffmpeg internal fields).
13 years ago
Nicolas George
00be2f5726
ffmpeg: adapt to the buffersrc API changes.
13 years ago
Nicolas George
aa1246ea42
lavfi: unify src_buffer and buffersrc.
...
Most of the code is moved to buffersrc.c
to help Git see the similarities.
src_buffer.c still contains the obsolete compatibility functions.
The format change detection code was removed as it has been
implemented directly in ffmpeg.
It can easily be brought back from the history.
13 years ago
Nicolas George
7997fc49ef
lavfi: remove stray reference to planar/packed.
13 years ago
Nicolas George
9567f410aa
avfilter: move some fields in AVFilterLink.
...
It restores ABI compatibility with libav.
The fields that move were very recent or morally private.
13 years ago
Michael Niedermayer
31dfe20dd2
Merge remote-tracking branch 'qatar/master'
...
* qatar/master:
doc: Replace some @file tags by more suitable markup.
fate: Set FUZZ factor of vorbis-13 test to 2.
fate: Set FUZZ factor of (e)ac3-encode test to 3.
fate: remove unused code from regressions-funcs.sh
rtmp: Don't assume path points to a string of nonzero length
avconv: fix behavior with -ss as an output option.
Conflicts:
doc/platform.texi
doc/protocols.texi
ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Michael Niedermayer
48a40e09c4
ffmpeg: fix warning & bug for keep_pix_fmt
...
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
13 years ago
Clément Bœsch
7f8bd16103
ffmpeg: remove unused variable i.
13 years ago
Clément Bœsch
9e2cee5770
ffmpeg: do not deprecate -vol and -map_channel.
...
These helpers are handy, just notice the user it is done using lavfi.
13 years ago
Clément Bœsch
fa29ca5f55
ffmpeg: resurrect -map_channel.
13 years ago
Clément Bœsch
48f30595f5
pan: use ff_parse_channel_layout() instead of av_get_channel_layout().
...
This allow specifying hexadecimal channel layout, and also handle the
error printing internally.
13 years ago
Clément Bœsch
7c2bb79f3b
lavu/error: fix make checkheaders.
...
The errors need to be defined before including functions depending on
them. See av_size_mult() for instance. stddef.h is included for the
prototype of av_sterror (use of size_t).
13 years ago
Clément Bœsch
1913989f56
build: add codec_names.h to SKIPHEADERS to fix make checkheaders.
13 years ago
Clément Bœsch
3dba3b265c
lavc/vda: fix make checkheaders.
13 years ago
Clément Bœsch
08ad9f9a78
lavc/os2threads: fix make checkheaders.
13 years ago