summaryrefslogtreecommitdiff
path: root/libavformat/utils.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2008-07-14 20:31:17 +0000
committerMichael Niedermayer <michaelni@gmx.at>2008-07-14 20:31:17 +0000
commit744b4c02c209d3781a12d4248b3a2a075dbf243c (patch)
tree76f0fa83b78d2470cc58b0b9f0c104192437e5db /libavformat/utils.c
parente1f15d3836b91d9ca8a1648b9baef80435f58d3e (diff)
Move the codec_id overriding at a slightly better place.
Originally committed as revision 14234 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/utils.c')
-rw-r--r--libavformat/utils.c10
1 files changed, 5 insertions, 5 deletions
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;