RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'b8604a976128ffbd316653cdec11ba487f1025bb' 

* commit 'b8604a976128ffbd316653cdec11ba487f1025bb':
  oggparsecelt: do not set AVCodecContext.frame_size

Conflicts:
	libavformat/oggparsecelt.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-07-09 22:48:25 +02:00
parent e932ae5940 b8604a9761
commit d52f874c7f
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavformat/oggparsecelt.c
View File

@ -42,7 +42,7 @@ static int celt_header(AVFormatContext *s, int idx)
!memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) { !memcmp(p, ff_celt_codec.magic, ff_celt_codec.magicsize)) {
/* Main header */ /* Main header */
uint32_t version, sample_rate, nb_channels, frame_size; uint32_t version, sample_rate, nb_channels;
uint32_t overlap, extra_headers; uint32_t overlap, extra_headers;
priv = av_malloc(sizeof(struct oggcelt_private)); priv = av_malloc(sizeof(struct oggcelt_private));
@ -56,7 +56,6 @@ static int celt_header(AVFormatContext *s, int idx)
/* unused header size field skipped */ /* unused header size field skipped */
sample_rate = AV_RL32(p + 36); sample_rate = AV_RL32(p + 36);
nb_channels = AV_RL32(p + 40); nb_channels = AV_RL32(p + 40);
frame_size = AV_RL32(p + 44);
overlap = AV_RL32(p + 48); overlap = AV_RL32(p + 48);
/* unused bytes per packet field skipped */ /* unused bytes per packet field skipped */
extra_headers = AV_RL32(p + 56); 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->codec_id = AV_CODEC_ID_CELT;
st->codec->sample_rate = sample_rate; st->codec->sample_rate = sample_rate;
st->codec->channels = nb_channels; st->codec->channels = nb_channels;
st->codec->frame_size = frame_size;
if (sample_rate) if (sample_rate)
avpriv_set_pts_info(st, 64, 1, sample_rate); avpriv_set_pts_info(st, 64, 1, sample_rate);
priv->extra_headers_left = 1 + extra_headers; priv->extra_headers_left = 1 + extra_headers;