apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-08 02:06:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Move the codec_id overriding at a slightly better place.

Browse Source 
Originally committed as revision 14234 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer
2008-07-14 20:31:17 +00:00
parent e1f15d3836
commit 744b4c02c2
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/utils.c
View File

@@ -563,11 +563,6 @@ int av_read_packet(AVFormatContext *s, AVPacket *pkt)
return ret; return ret;
st= s->streams[pkt->stream_index]; 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){ switch(st->codec->codec_type){
case CODEC_TYPE_VIDEO: case CODEC_TYPE_VIDEO:
if(s->video_codec_id) st->codec->codec_id= s->video_codec_id; 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; 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){ if(st->codec->codec_id == CODEC_ID_PROBE){
AVProbeData *pd = &st->probe_data; AVProbeData *pd = &st->probe_data;