diff options
| author | Nicolas George <nicolas.george@normalesup.org> | 2011-04-19 23:36:29 +0200 |
|---|---|---|
| committer | Nicolas George <nicolas.george@normalesup.org> | 2011-04-19 23:36:29 +0200 |
| commit | 90a29294169d8bc57dec2e0b600fe50c101ed625 (patch) | |
| tree | f809e7af3afa33e6c4cb7e0ed90693e5ed559efc | |
| parent | 51c1e255e53bc51b4b3bf071bdaf3e92c4814acc (diff) | |
| download | ffmpeg-90a29294169d8bc57dec2e0b600fe50c101ed625.tar.gz | |
oggparsecelt: cosmetic: order lines more logically.
Signed-off-by: Nicolas George <nicolas.george@normalesup.org>
| -rw-r--r-- | libavformat/oggparsecelt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/oggparsecelt.c b/libavformat/oggparsecelt.c index 488fa28bed..bbb695f438 100644 --- a/libavformat/oggparsecelt.c +++ b/libavformat/oggparsecelt.c @@ -61,21 +61,21 @@ static int celt_header(AVFormatContext *s, int idx) overlap = AV_RL32(p + 48); bytes_per_packet = AV_RL32(p + 52); /* unused */ extra_headers = AV_RL32(p + 56); - av_free(os->private); - av_free(st->codec->extradata); st->codec->codec_type = AVMEDIA_TYPE_AUDIO; st->codec->codec_id = CODEC_ID_CELT; st->codec->sample_rate = sample_rate; st->codec->channels = nb_channels; st->codec->frame_size = frame_size; st->codec->sample_fmt = AV_SAMPLE_FMT_S16; - st->codec->extradata = extradata; - st->codec->extradata_size = 2 * sizeof(uint32_t); av_set_pts_info(st, 64, 1, sample_rate); priv->extra_headers_left = 1 + extra_headers; + av_free(os->private); os->private = priv; AV_WL32(extradata + 0, overlap); AV_WL32(extradata + 4, version); + av_free(st->codec->extradata); + st->codec->extradata = extradata; + st->codec->extradata_size = 2 * sizeof(uint32_t); return 1; } else if(priv && priv->extra_headers_left) { |