# HG changeset patch # User aurel # Date 1251121230 0 # Node ID 8a649e932c1efe02d14b008c746fb51a2e9e231c # Parent 9c846d0a6803efdb0a76be8c2e4729b2a5c7cde1 matroskadec: factorize some code diff -r 9c846d0a6803 -r 8a649e932c1e matroskadec.c --- a/matroskadec.c Sat Aug 22 16:07:50 2009 +0000 +++ b/matroskadec.c Mon Aug 24 13:40:30 2009 +0000 @@ -1254,7 +1254,6 @@ ff_get_wav_header(&b, st->codec, track->codec_priv.size); codec_id = st->codec->codec_id; extradata_offset = 18; - track->codec_priv.size -= extradata_offset; } else if (!strcmp(track->codec_id, "V_QUICKTIME") && (track->codec_priv.size >= 86) && (track->codec_priv.data != NULL)) { @@ -1306,7 +1305,6 @@ } else if (codec_id == CODEC_ID_RV10 || codec_id == CODEC_ID_RV20 || codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) { extradata_offset = 26; - track->codec_priv.size -= extradata_offset; } else if (codec_id == CODEC_ID_RA_144) { track->audio.out_samplerate = 8000; track->audio.channels = 1; @@ -1327,9 +1325,9 @@ } else { st->codec->block_align = track->audio.sub_packet_size; extradata_offset = 78; - track->codec_priv.size -= extradata_offset; } } + track->codec_priv.size -= extradata_offset; if (codec_id == CODEC_ID_NONE) av_log(matroska->ctx, AV_LOG_INFO,