diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 15:34:06 +0400 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-25 17:15:16 +0400 |
commit | 46a35959d8c17f7ae272ca158d05e047d31e736c (patch) | |
tree | 2a999b2c04b33514efea0e2f75917e83a45e36e3 /libavformat/oggparsecelt.c | |
parent | 2089f933003b951b96b95e976bd34bbeffbd29f3 (diff) | |
parent | 7751e4693dd10ec98c20fbd9887233b575034272 (diff) |
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 'libavformat/oggparsecelt.c')
-rw-r--r-- | libavformat/oggparsecelt.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c index 053b74b74f..afc4392e2c 100644 --- a/libavformat/oggparsecelt.c +++ b/libavformat/oggparsecelt.c @@ -93,4 +93,5 @@ const struct ogg_codec ff_celt_codec = { .magic = "CELT ", .magicsize = 8, .header = celt_header, + .nb_header = 2, }; |