diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:48:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 22:48:25 +0200 |
| commit | d52f874c7fa716f49bf35838d6bf0959016f48f6 (patch) | |
| tree | 57dc56cd59a4b505deb9b9cad5a452fbcb2c0519 /libavformat | |
| parent | e932ae5940562ae0a183687053a5457a76fd1fa9 (diff) | |
| parent | b8604a976128ffbd316653cdec11ba487f1025bb (diff) | |
| download | ffmpeg-d52f874c7fa716f49bf35838d6bf0959016f48f6.tar.gz | |
Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb'
* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
oggparsecelt: do not set AVCodecContext.frame_size
Conflicts:
libavformat/oggparsecelt.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/oggparsecelt.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c index 759734cd5d..51ebc35e19 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; priv = av_malloc(sizeof(struct oggcelt_private)); @@ -56,7 +56,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); @@ -64,7 +63,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; if (sample_rate) avpriv_set_pts_info(st, 64, 1, sample_rate); priv->extra_headers_left = 1 + extra_headers; |