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

factorze another 2 lines

Browse Source 
Originally committed as revision 6635 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Michael Niedermayer 19 years ago
parent ce2f3c8b0c
commit d84fd5d153
1 changed files with 2 additions and 4 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. 6
      libavformat/amr.c

6
libavformat/amr.c
Unescape View File

@ -104,10 +104,8 @@ static int amr_read_header(AVFormatContext *s,
return AVERROR_NOMEM; return AVERROR_NOMEM;
} }
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b'); st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b');
st->codec->codec_id = CODEC_ID_AMR_WB; st->codec->codec_id = CODEC_ID_AMR_WB;
st->codec->channels = 1;
st->codec->sample_rate = 16000; st->codec->sample_rate = 16000;
} }
else else
@ -118,12 +116,12 @@ static int amr_read_header(AVFormatContext *s,
return AVERROR_NOMEM; return AVERROR_NOMEM;
} }
st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r'); st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r');
st->codec->codec_id = CODEC_ID_AMR_NB; st->codec->codec_id = CODEC_ID_AMR_NB;
st->codec->channels = 1;
st->codec->sample_rate = 8000; st->codec->sample_rate = 8000;
} }
st->codec->channels = 1;
st->codec->codec_type = CODEC_TYPE_AUDIO;
av_set_pts_info(st, 64, 1, st->codec->sample_rate); av_set_pts_info(st, 64, 1, st->codec->sample_rate);
return 0; return 0;

Write Preview
Loading…
Cancel
Save