• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 24823a76
    Michael Niedermayer authored
    * qatar/master:
      qdm2: remove broken and disabled dump_context() debug function
      x86: h264_intrapred: use newly introduced SPLAT* and PSHUFLW macros
      x86inc: add SPLATB_LOAD, SPLATB_REG, PSHUFLW macros
      x86inc: modify ALIGN to not generate long nops on i586
      x86: h264_intrapred: port to cpuflag macros
      avplay: update input filter pointer when the filtergraph is reset.
      avconv: fix parsing of -force_key_frames option.
      h264: use templates to avoid excessive inlining
      xtea: Make the count parameter match the documentation
      blowfish: Make the count parameter match the documentation
      mpegvideo: Don't use ff_mspel_motion() for vc1
      xtea: invert branch and loop precedence
      blowfish: invert branch and loop precedence
      flvdec: optionally trust the metadata
      avconv: Set audio filter time base to the sample rate
      vp8: Add ifdef guards around the sse2 loopfilter in the sse2slow branch too
    
    Conflicts:
    	ffmpeg.c
    	ffplay.c
    	libavcodec/h264.c
    	libavcodec/mpegvideo_common.h
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    24823a76
mpegvideo_common.h 33.8 KB