[FFmpeg-cvslog] r14234 - trunk/libavformat/utils.c
michael
subversion
Mon Jul 14 22:31:17 CEST 2008
Author: michael
Date: Mon Jul 14 22:31:17 2008
New Revision: 14234
Log:
Move the codec_id overriding at a slightly better place.
Modified:
trunk/libavformat/utils.c
Modified: trunk/libavformat/utils.c
==============================================================================
--- trunk/libavformat/utils.c (original)
+++ trunk/libavformat/utils.c Mon Jul 14 22:31:17 2008
@@ -563,11 +563,6 @@ int av_read_packet(AVFormatContext *s, A
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, A
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;
More information about the ffmpeg-cvslog
mailing list