# HG changeset patch
# User stefano
# Date 1285457236 0
# Node ID 29e95ae56fa9a23d84d8f581fcfaf523d974008b
# Parent  ac299df1864207aedc6c96faaf5223a1108f1625
Replace deprecated CODEC_TYPE_AUDIO and CODEC_TYPE_VIDEO with the
corresponding AVMEDIA_TYPE_* symbols.

diff -r ac299df18642 -r 29e95ae56fa9 asfdec.c
--- a/asfdec.c	Fri Sep 24 18:04:21 2010 +0000
+++ b/asfdec.c	Sat Sep 25 23:27:16 2010 +0000
@@ -639,7 +639,7 @@
                 av_reduce(&st->sample_aspect_ratio.num,
                           &st->sample_aspect_ratio.den,
                           dar[i].num, dar[i].den, INT_MAX);
-            } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==CODEC_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set.
+            } else if ((dar[0].num > 0) && (dar[0].den > 0) && (st->codec->codec_type==AVMEDIA_TYPE_VIDEO)) // Use ASF container value if the stream doesn't AR set.
                 av_reduce(&st->sample_aspect_ratio.num,
                           &st->sample_aspect_ratio.den,
                           dar[0].num, dar[0].den, INT_MAX);
diff -r ac299df18642 -r 29e95ae56fa9 flic.c
--- a/flic.c	Fri Sep 24 18:04:21 2010 +0000
+++ b/flic.c	Sat Sep 25 23:27:16 2010 +0000
@@ -152,7 +152,7 @@
 
         /* all audio frames are the same size, so use the size of the first chunk for block_align */
         ast->codec->block_align = AV_RL32(&preamble[0]);
-        ast->codec->codec_type = CODEC_TYPE_AUDIO;
+        ast->codec->codec_type = AVMEDIA_TYPE_AUDIO;
         ast->codec->codec_id = CODEC_ID_PCM_U8;
         ast->codec->codec_tag = 0;
         ast->codec->sample_rate = FLIC_TFTD_SAMPLE_RATE;
diff -r ac299df18642 -r 29e95ae56fa9 flvenc.c
--- a/flvenc.c	Fri Sep 24 18:04:21 2010 +0000
+++ b/flvenc.c	Sat Sep 25 23:27:16 2010 +0000
@@ -337,7 +337,7 @@
     /* Add EOS tag */
     for (i = 0; i < s->nb_streams; i++) {
         AVCodecContext *enc = s->streams[i]->codec;
-        if (enc->codec_type == CODEC_TYPE_VIDEO &&
+        if (enc->codec_type == AVMEDIA_TYPE_VIDEO &&
                 enc->codec_id == CODEC_ID_H264) {
             put_avc_eos_tag(pb, flv->last_video_ts);
         }
@@ -405,7 +405,7 @@
     }
 
     ts = pkt->dts + flv->delay; // add delay to force positive dts
-    if (enc->codec_type == CODEC_TYPE_VIDEO) {
+    if (enc->codec_type == AVMEDIA_TYPE_VIDEO) {
         if (flv->last_video_ts < ts)
             flv->last_video_ts = ts;
     }
diff -r ac299df18642 -r 29e95ae56fa9 rtpdec_qdm2.c
--- a/rtpdec_qdm2.c	Fri Sep 24 18:04:21 2010 +0000
+++ b/rtpdec_qdm2.c	Sat Sep 25 23:27:16 2010 +0000
@@ -307,7 +307,7 @@
 
 RTPDynamicProtocolHandler ff_qdm2_dynamic_handler = {
     "X-QDM",
-    CODEC_TYPE_AUDIO,
+    AVMEDIA_TYPE_AUDIO,
     CODEC_ID_NONE,
     NULL,
     qdm2_extradata_new,
diff -r ac299df18642 -r 29e95ae56fa9 rtpdec_svq3.c
--- a/rtpdec_svq3.c	Fri Sep 24 18:04:21 2010 +0000
+++ b/rtpdec_svq3.c	Sat Sep 25 23:27:16 2010 +0000
@@ -129,7 +129,7 @@
 
 RTPDynamicProtocolHandler ff_svq3_dynamic_handler = {
     "X-SV3V-ES",
-    CODEC_TYPE_VIDEO,
+    AVMEDIA_TYPE_VIDEO,
     CODEC_ID_NONE,          // see if (config_packet) above
     NULL,                   // parse sdp line
     svq3_extradata_new,
diff -r ac299df18642 -r 29e95ae56fa9 tty.c
--- a/tty.c	Fri Sep 24 18:04:21 2010 +0000
+++ b/tty.c	Sat Sep 25 23:27:16 2010 +0000
@@ -75,7 +75,7 @@
     if (!st)
         return AVERROR(ENOMEM);
     st->codec->codec_tag   = 0;
-    st->codec->codec_type  = CODEC_TYPE_VIDEO;
+    st->codec->codec_type  = AVMEDIA_TYPE_VIDEO;
     st->codec->codec_id    = CODEC_ID_ANSI;
     if (ap->width)  st->codec->width  = ap->width;
     if (ap->height) st->codec->height = ap->height;