-
- Downloads
Merge remote branch 'qatar/master'
* qatar/master:
psymodel: extend API to include PE and bit allocation.
avio: always compile dyn_buf functions
Remove unnecessary parameter from ff_thread_init() and fix behavior
Revert "aac_latm_dec: use aac context and aac m4ac"
configure: tell user if libva is enabled like the rest of external libs.
Add silence support for AV_SAMPLE_FMT_U8.
avio: make URL_PROTOCOL_FLAG_NESTED_SCHEME internal
avio: deprecate av_url_read_seek
avio: deprecate av_url_read_pause
ac3enc: NEON optimised extract_exponents
Conflicts:
libavcodec/utils.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
Showing
- configure 1 addition, 0 deletionsconfigure
- ffmpeg.c 9 additions, 1 deletionffmpeg.c
- libavcodec/aacdec.c 2 additions, 2 deletionslibavcodec/aacdec.c
- libavcodec/arm/ac3dsp_init_arm.c 2 additions, 0 deletionslibavcodec/arm/ac3dsp_init_arm.c
- libavcodec/arm/ac3dsp_neon.S 20 additions, 0 deletionslibavcodec/arm/ac3dsp_neon.S
- libavcodec/psymodel.h 9 additions, 0 deletionslibavcodec/psymodel.h
- libavcodec/utils.c 0 additions, 1 deletionlibavcodec/utils.c
- libavformat/avio.c 2 additions, 0 deletionslibavformat/avio.c
- libavformat/avio.h 4 additions, 27 deletionslibavformat/avio.h
- libavformat/avio_internal.h 22 additions, 0 deletionslibavformat/avio_internal.h
- libavformat/aviobuf.c 0 additions, 4 deletionslibavformat/aviobuf.c
- libavformat/url.h 5 additions, 0 deletionslibavformat/url.h
Loading
Please register or sign in to comment