• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 78accb87
    Michael Niedermayer authored
    * qatar/master:
      ffmpeg: fix some indentation
      ffmpeg: fix operation with --disable-avfilter
      simple_idct: remove disabled code
      motion_est: remove disabled code
      vc1: remove disabled code
      fate: separate lavf-mxf_d10 test from lavf-mxf
      cabac: Move code only used in the cabac test program to cabac.c.
      ffplay: warn that -pix_fmt is no longer working, suggest alternative
      ffplay: warn that -s is no longer working, suggest alternative
      lavf: rename enc variable in utils.c:has_codec_parameters()
      lavf: use designated initialisers for all (de)muxers.
      wav: remove a use of deprecated AV_METADATA_ macro
      rmdec: remove useless ap parameter from rm_read_header_old()
      dct-test: remove write-only variable
      des: fix #if conditional around P_shuffle
      Use LOCAL_ALIGNED in ff_check_alignment()
    
    Conflicts:
    	ffmpeg.c
    	libavformat/avidec.c
    	libavformat/matroskaenc.c
    	libavformat/mp3enc.c
    	libavformat/oggenc.c
    	libavformat/utils.c
    	tests/ref/lavf/mxf
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    78accb87
vocdec.c 5.03 KB