• Michael Niedermayer's avatar
    Merge remote-tracking branch 'qatar/master' · 022f8d27
    Michael Niedermayer authored
    * qatar/master:
      swscale: Readd #define _SVID_SOURCE
      Fix av_get_channel_layout_string() for positions >31
      configure: Store vda lib flags in extralibs instead of ldflags
      Make channel layout masks unsigned
      dca: ARMv6 optimised decode_blockcode()
      nullenc: drop AVFMT_RAWPICTURE from the flags
      frame-mt: return consumed packet size in ff_thread_decode_frame
      aacdec: add more fate tests covering SBR and PS
      MK(BE)TAG: avoid undefined shifts
    
    Conflicts:
    	configure
    	libavcodec/arm/dca.h
    	libavcodec/dca.c
    	libavcodec/mlp_parser.c
    	libavcodec/version.h
    	libavfilter/asrc_anullsrc.c
    	libavfilter/avfilter.c
    	libavfilter/avfilter.h
    	libavfilter/defaults.c
    	libavutil/audioconvert.c
    	libavutil/avutil.h
    	libswscale/utils.c
    Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
    022f8d27
aac_ac3_parser.h 2.02 KB