• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 3b46daa3
    Michael Niedermayer authored
    * 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: 's avatarMichael Niedermayer <michaelni@gmx.at>
    3b46daa3
sierra-vmd 18.8 KB