summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-04-04 18:21:37 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-04-04 18:21:37 +0200
commitca26c2c30fec45933fdc9a097d1326438b3c4ddc (patch)
tree77cc20baafe26b23b8366659a0bba0f21bbcd0b3 /libavformat
parentc22fd9bd9c2ac06e5960529a30a994141b2d03b1 (diff)
lavf: add mp1/2 to determinable_frame_size()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index 011cfbba61..5c5e24ca48 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -774,9 +774,9 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
static int determinable_frame_size(AVCodecContext *avctx)
{
- if (/*avctx->codec_id == CODEC_ID_AAC ||
+ if (/*avctx->codec_id == CODEC_ID_AAC ||*/
avctx->codec_id == CODEC_ID_MP1 ||
- avctx->codec_id == CODEC_ID_MP2 ||*/
+ avctx->codec_id == CODEC_ID_MP2 ||
avctx->codec_id == CODEC_ID_MP3/* ||
avctx->codec_id == CODEC_ID_CELT*/)
return 1;