summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2012-02-27 02:42:22 -0500
committerJustin Ruggles <justin.ruggles@gmail.com>2012-03-05 13:08:16 -0500
commitfbc8c59679e13831f5e835761d859858aae368a4 (patch)
treec8ec129491dc874070f65a0ab642cf4fef33bf86 /libavformat
parent84b6ae0808e4c63cfde4a5f47e33667d57838d8e (diff)
downloadffmpeg-fbc8c59679e13831f5e835761d859858aae368a4.tar.gz
avformat: do not require frame_size in avformat_find_stream_info() for MP1/2/3
It was only needed to avoid a bad time base (and thus non-monotone timestamps) for stream copy to avi.
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index dbc8a533f5..4677a11d32 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2019,9 +2019,6 @@ static int has_codec_parameters(AVCodecContext *avctx)
case AVMEDIA_TYPE_AUDIO:
val = avctx->sample_rate && avctx->channels && avctx->sample_fmt != AV_SAMPLE_FMT_NONE;
if (!avctx->frame_size &&
- avctx->codec_id == CODEC_ID_MP1 ||
- avctx->codec_id == CODEC_ID_MP2 ||
- avctx->codec_id == CODEC_ID_MP3 ||
avctx->codec_id == CODEC_ID_CELT))
return 0;
break;