aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2014-06-01 10:19:47 +0200
committerAnton Khirnov <anton@khirnov.net>2014-07-09 13:38:14 +0000
commitb8604a976128ffbd316653cdec11ba487f1025bb (patch)
treea2563af19b1899a7f5b62e533b658f5f64a61643
parentd5cf5afabbf43f00283e70b12afbe1da030d85b6 (diff)
downloadffmpeg-b8604a976128ffbd316653cdec11ba487f1025bb.tar.gz
oggparsecelt: do not set AVCodecContext.frame_size
It is supposed to be set by decoders only.
-rw-r--r--libavformat/oggparsecelt.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c
index e3ea586e9c..47ccc6f9ab 100644
--- a/libavformat/oggparsecelt.c
+++ b/libavformat/oggparsecelt.c
@@ -42,7 +42,7 @@ static int celt_header(AVFormatContext *s, int idx)
!memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) {
/* Main header */
- uint32_t version, sample_rate, nb_channels, frame_size;
+ uint32_t version, sample_rate, nb_channels;
uint32_t overlap, extra_headers;
uint8_t *extradata;
@@ -58,7 +58,6 @@ static int celt_header(AVFormatContext *s, int idx)
/* unused header size field skipped */
sample_rate = AV_RL32(p + 36);
nb_channels = AV_RL32(p + 40);
- frame_size = AV_RL32(p + 44);
overlap = AV_RL32(p + 48);
/* unused bytes per packet field skipped */
extra_headers = AV_RL32(p + 56);
@@ -68,7 +67,6 @@ static int celt_header(AVFormatContext *s, int idx)
st->codec->codec_id = AV_CODEC_ID_CELT;
st->codec->sample_rate = sample_rate;
st->codec->channels = nb_channels;
- st->codec->frame_size = frame_size;
st->codec->extradata = extradata;
st->codec->extradata_size = 2 * sizeof(uint32_t);
if (sample_rate)