[SCM] libav/experimental: set codec_tag to registration descriptor if present

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 5b3c4c8ac681ae7ccf3c50e8a8b17f0209277456
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun May 31 04:04:20 2009 +0000

    set codec_tag to registration descriptor if present
    
    Originally committed as revision 19012 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 0698721..61f91fd 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -590,7 +590,6 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
     int comp_page, anc_page;
     char language[4];
     uint32_t prog_reg_desc = 0; /* registration descriptor */
-    uint32_t reg_desc; /* registration descriptor */
 
 #ifdef DEBUG
     dprintf(ts->stream, "PMT: len %i\n", section_len);
@@ -707,10 +706,10 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
                 av_metadata_set(&st->metadata, "language", language);
                 break;
             case 0x05: /* registration descriptor */
-                reg_desc = bytestream_get_le32(&p);
+                st->codec->codec_tag = bytestream_get_le32(&p);
                 if (st->codec->codec_id == CODEC_ID_PROBE &&
                     stream_type == STREAM_TYPE_PRIVATE_DATA)
-                    mpegts_find_stream_type(st, reg_desc, REGD_types);
+                    mpegts_find_stream_type(st, st->codec->codec_tag, REGD_types);
                 break;
             default:
                 break;

-- 
Libav/FFmpeg packaging