From 744b4c02c209d3781a12d4248b3a2a075dbf243c Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Mon, 14 Jul 2008 20:31:17 +0000 Subject: Move the codec_id overriding at a slightly better place. Originally committed as revision 14234 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavformat/utils.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libavformat/utils.c') diff --git a/libavformat/utils.c b/libavformat/utils.c index 851df6b2d9..02ab108117 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -563,11 +563,6 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) return ret; st= s->streams[pkt->stream_index]; - if(!pktl && st->codec->codec_id!=CODEC_ID_PROBE) - return ret; - - add_to_pktbuf(&s->raw_packet_buffer, pkt); - switch(st->codec->codec_type){ case CODEC_TYPE_VIDEO: if(s->video_codec_id) st->codec->codec_id= s->video_codec_id; @@ -580,6 +575,11 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt) break; } + if(!pktl && st->codec->codec_id!=CODEC_ID_PROBE) + return ret; + + add_to_pktbuf(&s->raw_packet_buffer, pkt); + if(st->codec->codec_id == CODEC_ID_PROBE){ AVProbeData *pd = &st->probe_data; -- cgit v1.2.3