diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 20:31:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-05-19 20:31:24 +0200 |
| commit | 040a796dab2721abbbeceb3df8368e59254d6827 (patch) | |
| tree | ecc911ba7a60b4d8f083bbffb4c1362bd62065ad /libavfilter/af_aformat.c | |
| parent | 612abe2773e72cc3942069c104294ab2223338eb (diff) | |
| parent | 755cd4197d53946208e042f095b930dca18d9430 (diff) | |
| download | ffmpeg-040a796dab2721abbbeceb3df8368e59254d6827.tar.gz | |
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>
Diffstat (limited to 'libavfilter/af_aformat.c')
0 files changed, 0 insertions, 0 deletions