-
- Downloads
Merge commit '7751e469'
* commit '7751e469': 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>
Showing
- doc/APIchanges 4 additions, 0 deletionsdoc/APIchanges
- doc/examples/decoding_encoding.c 4 additions, 4 deletionsdoc/examples/decoding_encoding.c
- doc/examples/muxing.c 1 addition, 0 deletionsdoc/examples/muxing.c
- ffmpeg.c 2 additions, 2 deletionsffmpeg.c
- ffplay.c 2 additions, 2 deletionsffplay.c
- libavcodec/avcodec.h 15 additions, 3 deletionslibavcodec/avcodec.h
- libavcodec/libx264.c 1 addition, 0 deletionslibavcodec/libx264.c
- libavcodec/utils.c 52 additions, 15 deletionslibavcodec/utils.c
- libavcodec/version.h 1 addition, 1 deletionlibavcodec/version.h
- libavfilter/src_movie.c 1 addition, 1 deletionlibavfilter/src_movie.c
- libavformat/oggdec.c 1 addition, 0 deletionslibavformat/oggdec.c
- libavformat/oggdec.h 5 additions, 0 deletionslibavformat/oggdec.h
- libavformat/oggparsecelt.c 1 addition, 0 deletionslibavformat/oggparsecelt.c
- libavformat/oggparsedirac.c 2 additions, 0 deletionslibavformat/oggparsedirac.c
- libavformat/oggparseflac.c 4 additions, 2 deletionslibavformat/oggparseflac.c
- libavformat/oggparseogm.c 4 additions, 0 deletionslibavformat/oggparseogm.c
- libavformat/oggparseskeleton.c 1 addition, 0 deletionslibavformat/oggparseskeleton.c
- libavformat/oggparsespeex.c 2 additions, 1 deletionlibavformat/oggparsespeex.c
- libavformat/oggparsetheora.c 2 additions, 1 deletionlibavformat/oggparsetheora.c
- libavformat/oggparsevorbis.c 1 addition, 0 deletionslibavformat/oggparsevorbis.c
Loading
Please register or sign in to comment