diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-10-10 23:53:14 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-10-10 23:53:14 +0000 |
| commit | d84fd5d153f7d12504cf605c786e3cfd2397206d (patch) | |
| tree | 792cbd60e0a0213a04975e4513da793b171a6682 | |
| parent | ce2f3c8b0cdbc1a325a484b0bb4fc0af7ec41c18 (diff) | |
| download | ffmpeg-d84fd5d153f7d12504cf605c786e3cfd2397206d.tar.gz | |
factorze another 2 lines
Originally committed as revision 6635 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavformat/amr.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavformat/amr.c b/libavformat/amr.c index efdfb1e36e..9992f09959 100644 --- a/libavformat/amr.c +++ b/libavformat/amr.c @@ -104,10 +104,8 @@ static int amr_read_header(AVFormatContext *s, return AVERROR_NOMEM; } - st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_tag = MKTAG('s', 'a', 'w', 'b'); st->codec->codec_id = CODEC_ID_AMR_WB; - st->codec->channels = 1; st->codec->sample_rate = 16000; } else @@ -118,12 +116,12 @@ static int amr_read_header(AVFormatContext *s, return AVERROR_NOMEM; } - st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_tag = MKTAG('s', 'a', 'm', 'r'); st->codec->codec_id = CODEC_ID_AMR_NB; - st->codec->channels = 1; 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); return 0; |