-
- Downloads
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>
Showing
- configure 1 addition, 1 deletionconfigure
- libavcodec/aac_ac3_parser.h 1 addition, 1 deletionlibavcodec/aac_ac3_parser.h
- libavcodec/aacdectab.h 1 addition, 1 deletionlibavcodec/aacdectab.h
- libavcodec/ac3.h 1 addition, 1 deletionlibavcodec/ac3.h
- libavcodec/ac3enc.c 3 additions, 3 deletionslibavcodec/ac3enc.c
- libavcodec/ac3enc.h 1 addition, 1 deletionlibavcodec/ac3enc.h
- libavcodec/arm/dca.h 43 additions, 27 deletionslibavcodec/arm/dca.h
- libavcodec/audioconvert.c 1 addition, 1 deletionlibavcodec/audioconvert.c
- libavcodec/audioconvert.h 1 addition, 1 deletionlibavcodec/audioconvert.h
- libavcodec/avcodec.h 3 additions, 3 deletionslibavcodec/avcodec.h
- libavcodec/dca.c 17 additions, 12 deletionslibavcodec/dca.c
- libavcodec/mlp_parser.c 1 addition, 1 deletionlibavcodec/mlp_parser.c
- libavcodec/mlp_parser.h 1 addition, 1 deletionlibavcodec/mlp_parser.h
- libavcodec/pthread.c 3 additions, 2 deletionslibavcodec/pthread.c
- libavcodec/thread.h 3 additions, 0 deletionslibavcodec/thread.h
- libavcodec/version.h 1 addition, 1 deletionlibavcodec/version.h
- libavcodec/vorbis.h 1 addition, 1 deletionlibavcodec/vorbis.h
- libavcodec/vorbis_data.c 1 addition, 1 deletionlibavcodec/vorbis_data.c
- libavdevice/alsa-audio-common.c 2 additions, 2 deletionslibavdevice/alsa-audio-common.c
- libavfilter/asrc_anullsrc.c 1 addition, 1 deletionlibavfilter/asrc_anullsrc.c
Loading
Please register or sign in to comment