diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-03-21 23:47:44 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-03-22 00:40:11 +0100 |
| commit | 967facb6950549d0cc4e0ba79a056ebc6f93a049 (patch) | |
| tree | 872266e5d486be0ab8cf9e378bf567c191fba71a /tests/ref/lavf/ffm | |
| parent | f1fdd208cc0a1fce7aaaf6b0fe72b013525f49e0 (diff) | |
| parent | 6aba117f1273c7704312c6d892c9f552fa0661bb (diff) | |
| download | ffmpeg-967facb6950549d0cc4e0ba79a056ebc6f93a049.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master: (26 commits)
adxenc: use AVCodec.encode2()
adxenc: Use the AVFrame in ADXContext for coded_frame
indeo4: fix out-of-bounds function call.
configure: Restructure help output.
configure: Internal-only components should not be command-line selectable.
vorbisenc: use AVCodec.encode2()
libvorbis: use AVCodec.encode2()
libopencore-amrnbenc: use AVCodec.encode2()
ra144enc: use AVCodec.encode2()
nellymoserenc: use AVCodec.encode2()
roqaudioenc: use AVCodec.encode2()
libspeex: use AVCodec.encode2()
libvo_amrwbenc: use AVCodec.encode2()
libvo_aacenc: use AVCodec.encode2()
wmaenc: use AVCodec.encode2()
mpegaudioenc: use AVCodec.encode2()
libmp3lame: use AVCodec.encode2()
libgsmenc: use AVCodec.encode2()
libfaac: use AVCodec.encode2()
g726enc: use AVCodec.encode2()
...
Conflicts:
configure
libavcodec/Makefile
libavcodec/ac3enc.c
libavcodec/adxenc.c
libavcodec/libgsm.c
libavcodec/libvorbis.c
libavcodec/vorbisenc.c
libavcodec/wmaenc.c
tests/ref/acodec/g722
tests/ref/lavf/asf
tests/ref/lavf/ffm
tests/ref/lavf/mkv
tests/ref/lavf/mpg
tests/ref/lavf/rm
tests/ref/lavf/ts
tests/ref/seek/lavf_asf
tests/ref/seek/lavf_ffm
tests/ref/seek/lavf_mkv
tests/ref/seek/lavf_mpg
tests/ref/seek/lavf_rm
tests/ref/seek/lavf_ts
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/lavf/ffm')
| -rw-r--r-- | tests/ref/lavf/ffm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/ref/lavf/ffm b/tests/ref/lavf/ffm index 4767b9968e..e35f7a6149 100644 --- a/tests/ref/lavf/ffm +++ b/tests/ref/lavf/ffm @@ -1,3 +1,3 @@ -8ce2ea9a73a1187647df7bf3c8e1b8fd *./tests/data/lavf/lavf.ffm +793e977bc8b7f0d86f785a9062c4d978 *./tests/data/lavf/lavf.ffm 376832 ./tests/data/lavf/lavf.ffm ./tests/data/lavf/lavf.ffm CRC=0xf361ed74 |