Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Nov 2011 00:12:08 +0000 (01:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Nov 2011 00:12:08 +0000 (01:12 +0100)
commit022f8d27dd0a61bfaae729d53d133b17418ea16b
tree351bff9edab8404f7850ee05a238c50e6364e19b
parenta11eeb921571b23d1c988f9a2ddda109792948a6
parentf32dfad9dc64acf0fd1bb867e127a9efe6380676
Merge remote-tracking branch 'qatar/master'

* 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: Michael Niedermayer <michaelni@gmx.at>
26 files changed:
configure
libavcodec/aac_ac3_parser.h
libavcodec/aacdectab.h
libavcodec/ac3.h
libavcodec/ac3enc.c
libavcodec/audioconvert.c
libavcodec/audioconvert.h
libavcodec/avcodec.h
libavcodec/dca.c
libavcodec/mlp_parser.c
libavcodec/mlp_parser.h
libavcodec/pthread.c
libavcodec/thread.h
libavcodec/version.h
libavcodec/vorbis.h
libavcodec/vorbis_data.c
libavdevice/alsa-audio-common.c
libavfilter/asrc_anullsrc.c
libavfilter/avfilter.c
libavfilter/avfilter.h
libavformat/nullenc.c
libavutil/audioconvert.c
libavutil/audioconvert.h
libavutil/avutil.h
libavutil/common.h
tests/fate/aac.mak