aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/audioconvert.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-09-25 13:34:06 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-09-25 15:15:16 +0200
commit46a35959d8c17f7ae272ca158d05e047d31e736c (patch)
tree2a999b2c04b33514efea0e2f75917e83a45e36e3 /libswresample/audioconvert.h
parent2089f933003b951b96b95e976bd34bbeffbd29f3 (diff)
parent7751e4693dd10ec98c20fbd9887233b575034272 (diff)
downloadffmpeg-46a35959d8c17f7ae272ca158d05e047d31e736c.tar.gz
Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'
* commit '7751e4693dd10ec98c20fbd9887233b575034272': ogg: check that the expected number of headers had been parsed libx264: change default to closed gop to match x264cli Use avcodec_free_frame() to free AVFrames. lavf: use a malloced AVFrame in try_decode_frame(). lavc: add avcodec_free_frame(). lavc: ensure extended_data is set properly on decoding lavc: initialize AVFrame.extended_data in avcodec_get_frame_defaults() lavc: use av_mallocz to allocate AVFrames. lavc: rename the argument of avcodec_alloc_frame/get_frame_defaults Conflicts: doc/APIchanges doc/examples/decoding_encoding.c libavcodec/utils.c libavcodec/version.h libavfilter/src_movie.c libavformat/oggdec.c libavformat/oggdec.h libavformat/oggparsetheora.c libavformat/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/audioconvert.h')
0 files changed, 0 insertions, 0 deletions