diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-02-19 01:36:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-02-19 01:47:10 +0100 |
| commit | 4a519b6e036bb593d868c2a424da43512215c571 (patch) | |
| tree | bbbd734383e7b2bfd005a1c19fe64d36d493b576 /tests | |
| parent | 57182b9f0fa15ebedbf5229e17bc77a70cc68d9d (diff) | |
| parent | 5be805d38cb43e6f0b85941f75946d09bc8cc13f (diff) | |
| download | ffmpeg-4a519b6e036bb593d868c2a424da43512215c571.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
mov: Use defines for sample flags in fragments
mov: Use defines for trun flags
mov: Use defines for tfhd flags
proresenc: force bitrate not to exceed given limit
vc1parse: call vc1_init_common().
wma: don't return 0 on invalid packets.
asf: prevent packet_size_left from going negative if hdrlen > pktlen.
mjpegb: don't return 0 at the end of frame decoding.
rtpdec: Identify incorrectly signalled H263
vp8dsp: split long line.
aiff: don't skip block_align==0 check on COMM-after-SSND files.
dpcm: ignore extra unpaired bytes in stereo streams.
mp3on4: require a minimum framesize.
mpc7: assign an error level + context to av_log() msg.
huffyuv: error out on bit overrun.
dct-test: Add the missing ff_ prefix to the altivec functions
dct-test: Remove a stray declaration of a nonexistent function
movenc: Write the unknown duration as 64 bit fields in ismv
movenc: Write track durations with all bits set if duration is unknown
Conflicts:
libavcodec/dct-test.c
libavcodec/wmadec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/ref/lavf/ismv | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/ref/lavf/ismv b/tests/ref/lavf/ismv index 5922cb62af..cf0a5831ef 100644 --- a/tests/ref/lavf/ismv +++ b/tests/ref/lavf/ismv @@ -1,9 +1,9 @@ -c4e12d7ed2ab47d43b912eb160a2bea8 *./tests/data/lavf/lavf.ismv -312247 ./tests/data/lavf/lavf.ismv +eb116b60befadfd5c9118635d81c5a6e *./tests/data/lavf/lavf.ismv +312271 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0xbcc963fc -44c724f5dd12436d283aacc95065ad7f *./tests/data/lavf/lavf.ismv -321521 ./tests/data/lavf/lavf.ismv +90db70a6f33cf22db9ce242087b5870b *./tests/data/lavf/lavf.ismv +321545 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0x3998478f -c4e12d7ed2ab47d43b912eb160a2bea8 *./tests/data/lavf/lavf.ismv -312247 ./tests/data/lavf/lavf.ismv +eb116b60befadfd5c9118635d81c5a6e *./tests/data/lavf/lavf.ismv +312271 ./tests/data/lavf/lavf.ismv ./tests/data/lavf/lavf.ismv CRC=0xbcc963fc |