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 | |
| 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')
| -rw-r--r-- | tests/ref/lavf/asf | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/ffm | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/mkv | 4 | ||||
| -rw-r--r-- | tests/ref/lavf/mpg | 6 | ||||
| -rw-r--r-- | tests/ref/lavf/rm | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/ts | 2 | ||||
| -rw-r--r-- | tests/ref/lavf/wtv | 2 |
7 files changed, 10 insertions, 10 deletions
diff --git a/tests/ref/lavf/asf b/tests/ref/lavf/asf index c6e6b6baf4..180f98bed9 100644 --- a/tests/ref/lavf/asf +++ b/tests/ref/lavf/asf @@ -1,3 +1,3 @@ -3d410176ebf9ffdf99d2738922cef260 *./tests/data/lavf/lavf.asf +e60b298a4db9bcedaabaaee9f90d2a42 *./tests/data/lavf/lavf.asf 333489 ./tests/data/lavf/lavf.asf ./tests/data/lavf/lavf.asf CRC=0x9f5ab3e6 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 diff --git a/tests/ref/lavf/mkv b/tests/ref/lavf/mkv index de8982ee46..a88b47bb5e 100644 --- a/tests/ref/lavf/mkv +++ b/tests/ref/lavf/mkv @@ -1,3 +1,3 @@ -f99ae18e1212ee184188243107a4b824 *./tests/data/lavf/lavf.mkv +19c989b2a18dc352ede9754af5fcb5f2 *./tests/data/lavf/lavf.mkv 320521 ./tests/data/lavf/lavf.mkv -./tests/data/lavf/lavf.mkv CRC=0x2a83e6b0 +./tests/data/lavf/lavf.mkv CRC=0x5b4ae6b0 diff --git a/tests/ref/lavf/mpg b/tests/ref/lavf/mpg index a22e2088a6..fe55f51aeb 100644 --- a/tests/ref/lavf/mpg +++ b/tests/ref/lavf/mpg @@ -1,9 +1,9 @@ -6103dbae73aec6c9bf05bbbc6ea35f89 *./tests/data/lavf/lavf.mpg +855384c0cd3d0e3843d48698441c1384 *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg ./tests/data/lavf/lavf.mpg CRC=0xf361ed74 -91b42dd3352e21dd0dee57f6a7241ca2 *./tests/data/lavf/lavf.mpg +612b686e2c035b18175ccefdacf9532c *./tests/data/lavf/lavf.mpg 387072 ./tests/data/lavf/lavf.mpg ./tests/data/lavf/lavf.mpg CRC=0x3d6ddf56 -dd60652c2193670abffb8c2a123a820e *./tests/data/lavf/lavf.mpg +fcf2c242b41373186d43de3d5c518e5a *./tests/data/lavf/lavf.mpg 372736 ./tests/data/lavf/lavf.mpg ./tests/data/lavf/lavf.mpg CRC=0xf361ed74 diff --git a/tests/ref/lavf/rm b/tests/ref/lavf/rm index e1fd6d5671..d2a094763c 100644 --- a/tests/ref/lavf/rm +++ b/tests/ref/lavf/rm @@ -1,2 +1,2 @@ -2b0eebb5814825c9c4b385cbf8e5b0da *./tests/data/lavf/lavf.rm +be73bce6e371fd543f93f668406f3430 *./tests/data/lavf/lavf.rm 346714 ./tests/data/lavf/lavf.rm diff --git a/tests/ref/lavf/ts b/tests/ref/lavf/ts index 18566c47bc..716216e2cb 100644 --- a/tests/ref/lavf/ts +++ b/tests/ref/lavf/ts @@ -1,3 +1,3 @@ -34f95a300355d474767b436430eba15b *./tests/data/lavf/lavf.ts +258a64dbc1724438e90560294be4be5c *./tests/data/lavf/lavf.ts 406644 ./tests/data/lavf/lavf.ts ./tests/data/lavf/lavf.ts CRC=0x133216c1 diff --git a/tests/ref/lavf/wtv b/tests/ref/lavf/wtv index f0668a7d72..d0a3ad742f 100644 --- a/tests/ref/lavf/wtv +++ b/tests/ref/lavf/wtv @@ -1,3 +1,3 @@ -7bd312f32538a14f248c2dff85394118 *./tests/data/lavf/lavf.wtv +de9c3be54bafeba1b7f9618609bd0f62 *./tests/data/lavf/lavf.wtv 413696 ./tests/data/lavf/lavf.wtv ./tests/data/lavf/lavf.wtv CRC=0x133216c1 |