[SCM] libav/experimental: remove defines

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 2fef7b537436afdb3e01544a7f2ac5bae7dad3b7
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sun May 31 03:02:12 2009 +0000

    remove defines
    
    Originally committed as revision 19004 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mpegts.c b/libavformat/mpegts.c
index 5f94c2a..2c5ff65 100644
--- a/libavformat/mpegts.c
+++ b/libavformat/mpegts.c
@@ -35,7 +35,6 @@
 /* maximum size in which we look for synchronisation if
    synchronisation is lost */
 #define MAX_RESYNC_SIZE 4096
-#define REGISTRATION_DESCRIPTOR 5
 
 #define MAX_PES_PAYLOAD 200*1024
 
@@ -534,7 +533,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
             //something else is broken, exit the program_descriptors_loop
             break;
         program_info_length -= len + 2;
-        if(tag == REGISTRATION_DESCRIPTOR && len >= 4) {
+        if(tag == 0x05 && len >= 4) { // registration descriptor
             prog_reg_desc = bytestream_get_le32(&p);
             len -= 4;
         }
@@ -583,9 +582,9 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
                    desc_tag, desc_len);
 
             switch(desc_tag) {
-            case DVB_SUBT_DESCID:
+            case 0x59: /* subtitling descriptor */
                 if (stream_type == STREAM_TYPE_PRIVATE_DATA)
-                    stream_type = STREAM_TYPE_SUBTITLE_DVB; // demuxer internal
+                    stream_type = 0x100; // demuxer internal
 
                 language[0] = get8(&p, desc_end);
                 language[1] = get8(&p, desc_end);
@@ -602,7 +601,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
                 language[2] = get8(&p, desc_end);
                 language[3] = 0;
                 break;
-            case REGISTRATION_DESCRIPTOR: /*MPEG-2 Registration descriptor */
+            case 0x05: /* registration descriptor */
                 reg_desc = bytestream_get_le32(&p);
                 break;
             default:
@@ -634,7 +633,7 @@ static void pmt_cb(MpegTSFilter *filter, const uint8_t *section, int section_len
             if (language[0] != 0)
                 av_metadata_set(&st->metadata, "language", language);
 
-            if (stream_type == STREAM_TYPE_SUBTITLE_DVB)
+            if (stream_type == 0x100)
                 st->codec->sub_id = (anc_page << 16) | comp_page;
         }
     }
@@ -956,7 +955,7 @@ static const StreamType HDMV_types[] = {
 static const StreamType MISC_types[] = {
     { 0x81, CODEC_TYPE_AUDIO,   CODEC_ID_AC3 },
     { 0x8a, CODEC_TYPE_AUDIO,   CODEC_ID_DTS },
-    { STREAM_TYPE_SUBTITLE_DVB, CODEC_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE }, // demuxer internal
+    {0x100, CODEC_TYPE_SUBTITLE, CODEC_ID_DVB_SUBTITLE }, // demuxer internal
     { 0 },
 };
 
diff --git a/libavformat/mpegts.h b/libavformat/mpegts.h
index 4d06b1d..e5df071 100644
--- a/libavformat/mpegts.h
+++ b/libavformat/mpegts.h
@@ -39,9 +39,6 @@
 #define PMT_TID   0x02
 #define SDT_TID   0x42
 
-/* descriptor ids */
-#define DVB_SUBT_DESCID             0x59
-
 #define STREAM_TYPE_VIDEO_MPEG1     0x01
 #define STREAM_TYPE_VIDEO_MPEG2     0x02
 #define STREAM_TYPE_AUDIO_MPEG1     0x03
@@ -56,9 +53,6 @@
 
 #define STREAM_TYPE_AUDIO_AC3       0x81
 #define STREAM_TYPE_AUDIO_DTS       0x8a
-#define STREAM_TYPE_AUDIO_HDMV_DTS  0x82
-
-#define STREAM_TYPE_SUBTITLE_DVB    0x100
 
 typedef struct MpegTSContext MpegTSContext;
 

-- 
Libav/FFmpeg packaging