diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-05-05 03:09:48 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-05-05 03:30:24 +0200 |
| commit | b000b86e1dd03c4ff89cd63a6fa88fc280947c94 (patch) | |
| tree | 8ba961dc8c013885d7bdfe944fb7cb31d5dc6d95 /tests/ref/fate/vc1 | |
| parent | 9a5624a0f1b205e966391645a512c6dccdce42cd (diff) | |
| parent | af1ca249e8eb685823dd0dade3aa3c1d119a61ec (diff) | |
| download | ffmpeg-b000b86e1dd03c4ff89cd63a6fa88fc280947c94.tar.gz | |
Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
doc: Check standalone compilation before submitting new components.
Fix standalone compilation of pipe protocol.
Fix standalone compilation of ac3_fixed encoder.
Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
Fix standalone compilation of IMC decoder.
Fix standalone compilation of WTV demuxer.
Fix standalone compilation of MXPEG decoder.
flashsv: K&R cosmetics
matroskaenc: fix memory leak
vc1: make overlap filter for I-frames bit-exact.
vc1dec: use s->start/end_mb_y instead of passing them as function args.
Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
Replace strncpy() with av_strlcpy().
indeo3: Eliminate use of long.
get_bits: make cache unsigned to eliminate undefined signed overflow.
asfdec: fix assert failure on invalid files
avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled: mpegvideo: reindent.
nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg *: don't av_malloc(0).
...
Conflicts:
doc/developer.texi
libavcodec/Makefile
libavcodec/get_bits.h
libavcodec/mpegvideo.c
libavformat/Makefile
libavutil/log.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ref/fate/vc1')
| -rw-r--r-- | tests/ref/fate/vc1 | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/tests/ref/fate/vc1 b/tests/ref/fate/vc1 index 69e9b4ad64..901f81a97f 100644 --- a/tests/ref/fate/vc1 +++ b/tests/ref/fate/vc1 @@ -1,15 +1,15 @@ -0, 0, 38016, 0xf4715db5 -0, 3600, 38016, 0xf4715db5 -0, 7200, 38016, 0xf4715db5 -0, 10800, 38016, 0xf46af0e1 -0, 14400, 38016, 0x9c1c2cf1 -0, 18000, 38016, 0xff12d87f -0, 21600, 38016, 0x7408432b -0, 25200, 38016, 0x7408432b -0, 28800, 38016, 0x8d11479a -0, 32400, 38016, 0x8d11479a -0, 36000, 38016, 0xc4a121ab -0, 39600, 38016, 0xc4a121ab -0, 43200, 38016, 0xc4a121ab -0, 46800, 38016, 0xc4a121ab -0, 50400, 38016, 0xc4a121ab +0, 0, 38016, 0xa6f15db5 +0, 3600, 38016, 0xa6f15db5 +0, 7200, 38016, 0xa6f15db5 +0, 10800, 38016, 0x5c4ef0e7 +0, 14400, 38016, 0x53a42d1d +0, 18000, 38016, 0x68f7d89e +0, 21600, 38016, 0xc15f4368 +0, 25200, 38016, 0xc15f4368 +0, 28800, 38016, 0xd1bd47a8 +0, 32400, 38016, 0xd1bd47a8 +0, 36000, 38016, 0xe1e821ca +0, 39600, 38016, 0xe1e821ca +0, 43200, 38016, 0xe1e821ca +0, 46800, 38016, 0xe1e821ca +0, 50400, 38016, 0xe1e821ca |