-
- Downloads
Merge remote-tracking branch 'qatar/master'
* qatar/master: (22 commits)
g722dec: check output buffer size before decoding
g722dec: cosmetics: reindent/linewrap
g722dec: remove the use of lowres for half-rate decoding.
tta: check for extradata allocation failure in tta demuxer
tta: check for allocation failure of decode_buffer
tta: use correct frame_length calculation.
tta: add support for decoding 24-bit sample format
cosmetics: indentation
tta: remove pointless braces
tta: check output buffer size after adjusting frame length for last frame
tta: fix reading of format in TTA header.
tta: remove useless commented-out lines
tta: check remaining bitstream size while reading unary value
lavf: deprecate AVStream.stream_copy
avconc: split choose_codec() to choose_decoder/choose_encoder.
lavf: simplify by using FFMAX/FFMIN.
mpegenc: add preload private option.
cosmetics: simplify latm_decode_init
latm: avoid unnecessary reinit of the aac decoder
aacdec: initialize sbr context only in new channel elements
...
Conflicts:
avconv.c
libavcodec/resample.c
libavcodec/tta.c
libavformat/utils.c
Merged-by:
Michael Niedermayer <michaelni@gmx.at>
No related branches found
No related tags found
Showing
- avconv.c 46 additions, 41 deletionsavconv.c
- ffmpeg.c 52 additions, 47 deletionsffmpeg.c
- libavcodec/aacdec.c 10 additions, 12 deletionslibavcodec/aacdec.c
- libavcodec/g722dec.c 26 additions, 30 deletionslibavcodec/g722dec.c
- libavcodec/resample.c 0 additions, 1 deletionlibavcodec/resample.c
- libavcodec/tta.c 136 additions, 142 deletionslibavcodec/tta.c
- libavformat/avformat.h 6 additions, 2 deletionslibavformat/avformat.h
- libavformat/mpegenc.c 9 additions, 1 deletionlibavformat/mpegenc.c
- libavformat/tta.c 4 additions, 0 deletionslibavformat/tta.c
- libavformat/utils.c 6 additions, 12 deletionslibavformat/utils.c
- libavformat/version.h 6 additions, 0 deletionslibavformat/version.h
Loading
Please register or sign in to comment