[SCM] libav/experimental: Move the codec_id overriding at a slightly better place.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 744b4c02c209d3781a12d4248b3a2a075dbf243c
Author: Michael Niedermayer <michaelni at gmx.at>
Date:   Mon Jul 14 20:31:17 2008 +0000

    Move the codec_id overriding at a slightly better place.
    
    Originally committed as revision 14234 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/utils.c b/libavformat/utils.c
index 851df6b..02ab108 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;
 

-- 
Libav/FFmpeg packaging