1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-02 03:06:28 +02:00
FFmpeg/tests/ref/fate/creatureshock-avs

104 lines
5.4 KiB
Plaintext
Raw Normal View History

#tb 0: 1/15
#media_type 0: video
#codec_id 0: rawvideo
#dimensions 0: 318x198
#sar 0: 0/1
#tb 1: 1/22222
#media_type 1: audio
#codec_id 1: pcm_s16le
#sample_rate 1: 22222
#channel_layout 1: 4
#channel_layout_name 1: mono
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 0, 0, 1, 188892, 0x9f47a5ec
1, 0, 0, 8186, 16372, 0xfaaab59d
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 1, 1, 1, 188892, 0xdece0269
0, 2, 2, 1, 188892, 0xd097e86e
0, 3, 3, 1, 188892, 0x1cf2de83
0, 4, 4, 1, 188892, 0xb664fd10
0, 5, 5, 1, 188892, 0xc654f4c1
1, 8186, 8186, 2014, 4028, 0xc2daed72
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 6, 6, 1, 188892, 0x5adac3ff
1, 10200, 10200, 2743, 5486, 0xf7fd794d
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 7, 7, 1, 188892, 0x5928954e
0, 8, 8, 1, 188892, 0x5e4cad6c
1, 12943, 12943, 2895, 5790, 0xfd5a369f
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 9, 9, 1, 188892, 0xbbb5f11b
0, 10, 10, 1, 188892, 0xcb6bbdee
1, 15838, 15838, 534, 1068, 0x0b602cd0
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 11, 11, 1, 188892, 0xa5b3b316
1, 16372, 16372, 2454, 4908, 0xfe870aad
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 12, 12, 1, 188892, 0x9bf87b5d
1, 18826, 18826, 3031, 6062, 0x8a4d6e0f
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 13, 13, 1, 188892, 0xcc3981be
0, 14, 14, 1, 188892, 0x2eb44dfa
1, 21857, 21857, 2701, 5402, 0x71fd352f
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 15, 15, 1, 188892, 0x11c861b9
0, 16, 16, 1, 188892, 0x7c1b767b
1, 24558, 24558, 272, 544, 0xeb766d34
1, 24830, 24830, 2953, 5906, 0x47ac7e08
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 17, 17, 1, 188892, 0x5078694c
0, 18, 18, 1, 188892, 0xa24485c2
1, 27783, 27783, 2958, 5916, 0x0d26eb56
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 19, 19, 1, 188892, 0xc8016946
0, 20, 20, 1, 188892, 0x71e3493b
1, 30741, 30741, 2003, 4006, 0x9941c71a
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 21, 21, 1, 188892, 0xa9771a0d
0, 22, 22, 1, 188892, 0x98be33fd
1, 32744, 32744, 1050, 2100, 0xc9a2ee36
1, 33794, 33794, 2947, 5894, 0xd2ba4eaa
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 23, 23, 1, 188892, 0x193e4cda
0, 24, 24, 1, 188892, 0x3b444fd1
1, 36741, 36741, 3045, 6090, 0xf43e73d0
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 25, 25, 1, 188892, 0x8bfe594c
0, 26, 26, 1, 188892, 0xaab8267b
1, 39786, 39786, 1144, 2288, 0x5a8b7aa0
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 27, 27, 1, 188892, 0x03206c55
1, 40930, 40930, 1925, 3850, 0x7f66eb2c
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 28, 28, 1, 188892, 0x8ed7ea7d
1, 42855, 42855, 2898, 5796, 0xc5cf3ee8
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 29, 29, 1, 188892, 0x2a1bc3e1
0, 30, 30, 1, 188892, 0xa6a12aa7
1, 45753, 45753, 3021, 6042, 0xed80136d
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 31, 31, 1, 188892, 0xa96ca4fa
0, 32, 32, 1, 188892, 0x3e3a6d70
1, 48774, 48774, 342, 684, 0xc42bd137
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 33, 33, 1, 188892, 0x47e173dd
1, 49116, 49116, 2718, 5436, 0xb7f8a6fd
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 34, 34, 1, 188892, 0xfcf183ba
1, 51834, 51834, 3049, 6098, 0xee6354a2
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 35, 35, 1, 188892, 0xf051be46
0, 36, 36, 1, 188892, 0x8aa6b100
0, 37, 37, 1, 188892, 0x36c86b01
1, 54883, 54883, 2419, 4838, 0x129e61d0
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 38, 38, 1, 188892, 0x15ae396e
1, 57302, 57302, 537, 1074, 0x9da90634
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 39, 39, 1, 188892, 0xc876eabf
1, 57839, 57839, 3042, 6084, 0x8ffed952
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 40, 40, 1, 188892, 0xc5c65fae
0, 41, 41, 1, 188892, 0x4feec932
1, 60881, 60881, 3019, 6038, 0xa07b4276
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 42, 42, 1, 188892, 0x21374e88
0, 43, 43, 1, 188892, 0x52e689f1
1, 63900, 63900, 1588, 3176, 0xebef63c1
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 44, 44, 1, 188892, 0x9e2492e8
1, 65488, 65488, 1397, 2794, 0xbe1000db
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 45, 45, 1, 188892, 0xac841247
1, 66885, 66885, 3010, 6020, 0xd8e34961
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 46, 46, 1, 188892, 0x8467aab2
0, 47, 47, 1, 188892, 0x552b6029
1, 69895, 69895, 3010, 6020, 0xc07cf461
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 48, 48, 1, 188892, 0x836eb46e
0, 49, 49, 1, 188892, 0x93eb9f1b
1, 72905, 72905, 769, 1538, 0xc975ae02
1, 73674, 73674, 2115, 4230, 0x0827111b
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 50, 50, 1, 188892, 0xa3661fdd
0, 51, 51, 1, 188892, 0x433d22dd
1, 75789, 75789, 3042, 6084, 0x2cf0a407
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 52, 52, 1, 188892, 0xd64dbc4e
0, 53, 53, 1, 188892, 0x4a2aa0e3
1, 78831, 78831, 2914, 5828, 0x12750279
Merge remote-tracking branch 'qatar/master' * qatar/master: dsputil: remove debug message in dsputil_init(). movdec: Avoid av_malloc(0) in stss build: Drop YASM-OBJS-FFT from SUBDIR_VARS. build: Drop unused X86-OBJS variable. avconv: remove debugging cruft from do_video_out(). avconv: factorize setting stream_index for the output packet. frame{crc/md5}: set the stream timebase from codec timebase. apedec: remove unneeded #include of get_bits.h and associated macro apedec: av_fast_malloc() instead of av_realloc() apedec: fix handling of packet sizes that are not a multiple of 4 bytes Conflicts: libavcodec/apedec.c tests/ref/fate/4xm-1 tests/ref/fate/4xm-2 tests/ref/fate/aasc tests/ref/fate/armovie-escape124 tests/ref/fate/bethsoft-vid tests/ref/fate/cljr tests/ref/fate/creatureshock-avs tests/ref/fate/cscd tests/ref/fate/cvid-partial tests/ref/fate/deluxepaint-anm tests/ref/fate/dfa1 tests/ref/fate/dfa10 tests/ref/fate/dfa11 tests/ref/fate/dfa2 tests/ref/fate/dfa3 tests/ref/fate/dfa4 tests/ref/fate/dfa5 tests/ref/fate/dfa6 tests/ref/fate/dfa7 tests/ref/fate/dfa8 tests/ref/fate/dfa9 tests/ref/fate/film-cvid-pcm-stereo-8bit tests/ref/fate/flic-af11-palette-change tests/ref/fate/flic-magiccarpet tests/ref/fate/fraps-v2 tests/ref/fate/fraps-v3 tests/ref/fate/h264-lossless tests/ref/fate/interplay-mve-16bit tests/ref/fate/interplay-mve-8bit tests/ref/fate/mimic tests/ref/fate/motionpixels tests/ref/fate/mpeg2-field-enc tests/ref/fate/msvideo1-16bit tests/ref/fate/mtv tests/ref/fate/nuv tests/ref/fate/pictor tests/ref/fate/prores-alpha tests/ref/fate/ptx tests/ref/fate/qtrle-16bit tests/ref/fate/qtrle-1bit tests/ref/fate/quickdraw tests/ref/fate/rpza tests/ref/fate/sierra-vmd tests/ref/fate/targa-conformance-CCM8 tests/ref/fate/targa-conformance-UCM8 tests/ref/fate/tiertex-seq tests/ref/fate/truemotion1-15 tests/ref/fate/truemotion1-24 tests/ref/fate/tscc-15bit tests/ref/fate/tscc-32bit tests/ref/fate/v210 tests/ref/fate/vc1-ism tests/ref/fate/vc1_sa00040 tests/ref/fate/vc1_sa00050 tests/ref/fate/vc1_sa10091 tests/ref/fate/vc1_sa20021 tests/ref/fate/vmnc-16bit tests/ref/fate/vmnc-32bit tests/ref/fate/vp5 tests/ref/fate/vp8-sign-bias tests/ref/fate/vqa-cc tests/ref/fate/wmv8-drm tests/ref/fate/yop tests/ref/fate/zmbv-8bit Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-02-04 04:14:54 +03:00
0, 54, 54, 1, 188892, 0xd98e4d4b
0, 55, 55, 1, 188892, 0x00000000
1, 81745, 81745, 115, 230, 0xc9c03f3b
1, 81860, 81860, 384, 768, 0x6137a04d