• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 04b53746
    Michael Niedermayer authored
    * qatar/master:
      rtpdec: Use 4 byte startcodes for H.264
      matroskadec: Mark variable as av_unused.
      Move some conditionally used variables into the block where they are used.
      Drop some completely unnecessary av_unused attributes.
      swscale: Remove unused variable alpMmxFilter.
      Drop unnecessary av_uninit attributes from some variable declarations.
      movenc: Support muxing wmapro in ismv/isma
      mpegtsenc: Add an AVOption for forcing a new PAT/PMT/SDT to be written
      swscale: move YUV2PACKED16WRAPPER() macro down to where it is used.
      swscale: handle gray16 as a "planar" YUV format (Y-only, of course).
      swscale: use yuv2packed1() functions for unscaled chroma also.
      swscale: fix incorrect chroma bias in yuv2rgb48_1_c().
      swscale: fix invalid memory accesses in yuvpacked1() functions.
      Move PS2 MMI code below the mips subdirectory, where it belongs.
      mips: Move MMI function declarations to a header.
      build: Set correct dependencies for rtmp* protocols implemented by librtmp.
    
    Conflicts:
    	libavcodec/ac3enc_template.c
    	libavformat/mpegtsenc.c
    	libswscale/output.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    04b53746
eatgv.c 10.4 KB