Commit 494b4e12 authored by michael's avatar michael

Move the codec_id overriding at a slightly better place.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@14234 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 5247d0d5
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment