Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

matroskadec: factorize some code

Browse Source 
Originally committed as revision 19693 to svn://svn.ffmpeg.org/ffmpeg/trunk
release/0.6
Aurelien Jacobs 16 years ago
parent deb1b2b699
commit e26444079c
1 changed files with 1 additions and 3 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 4
      libavformat/matroskadec.c

4
libavformat/matroskadec.c
Unescape View File

@ -1254,7 +1254,6 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
ff_get_wav_header(&b, st->codec, track->codec_priv.size); ff_get_wav_header(&b, st->codec, track->codec_priv.size);
codec_id = st->codec->codec_id; codec_id = st->codec->codec_id;
extradata_offset = 18; extradata_offset = 18;
track->codec_priv.size -= extradata_offset;
} else if (!strcmp(track->codec_id, "V_QUICKTIME") } else if (!strcmp(track->codec_id, "V_QUICKTIME")
&& (track->codec_priv.size >= 86) && (track->codec_priv.size >= 86)
&& (track->codec_priv.data != NULL)) { && (track->codec_priv.data != NULL)) {
@ -1306,7 +1305,6 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
} else if (codec_id == CODEC_ID_RV10 || codec_id == CODEC_ID_RV20 || } else if (codec_id == CODEC_ID_RV10 || codec_id == CODEC_ID_RV20 ||
codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) { codec_id == CODEC_ID_RV30 || codec_id == CODEC_ID_RV40) {
extradata_offset = 26; extradata_offset = 26;
track->codec_priv.size -= extradata_offset;
} else if (codec_id == CODEC_ID_RA_144) { } else if (codec_id == CODEC_ID_RA_144) {
track->audio.out_samplerate = 8000; track->audio.out_samplerate = 8000;
track->audio.channels = 1; track->audio.channels = 1;
@ -1327,9 +1325,9 @@ static int matroska_read_header(AVFormatContext *s, AVFormatParameters *ap)
} else { } else {
st->codec->block_align = track->audio.sub_packet_size; st->codec->block_align = track->audio.sub_packet_size;
extradata_offset = 78; extradata_offset = 78;
track->codec_priv.size -= extradata_offset;
} }
} }
track->codec_priv.size -= extradata_offset;
if (codec_id == CODEC_ID_NONE) if (codec_id == CODEC_ID_NONE)
av_log(matroska->ctx, AV_LOG_INFO, av_log(matroska->ctx, AV_LOG_INFO,

Write Preview
Loading…
Cancel
Save