diff -ruN upnp-old//dlna/avdetector.cpp upnp-2009.11.19//dlna/avdetector.cpp
--- upnp-old//dlna/avdetector.cpp	2010-01-27 18:55:30.000000000 +0100
+++ upnp-2009.11.19//dlna/avdetector.cpp	2011-10-26 07:25:14.000000000 +0200
@@ -209,7 +209,7 @@
 
 int cAudioVideoDetector::analyseVideo(AVFormatContext* FormatCtx)
 {
-    AVCodecContext* VideoCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, CODEC_TYPE_VIDEO);
+    AVCodecContext* VideoCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, AVMEDIA_TYPE_VIDEO);
     
     if(!VideoCodec){
         ERROR("AVDetector: codec not found");
@@ -234,7 +234,7 @@
 }
 
 int cAudioVideoDetector::analyseAudio(AVFormatContext* FormatCtx){
-    AVCodecContext* AudioCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, CODEC_TYPE_AUDIO);
+    AVCodecContext* AudioCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, AVMEDIA_TYPE_AUDIO);
 
     if(!AudioCodec){
         ERROR("AVDetector: codec not found");
@@ -261,11 +261,11 @@
     return -1;
 }
 
-AVCodecContext* cCodecToolKit::getFirstCodecContext(AVFormatContext* FormatCtx, CodecType Type){
+AVCodecContext* cCodecToolKit::getFirstCodecContext(AVFormatContext* FormatCtx, AVMediaType Type){
     return cCodecToolKit::getFirstStream(FormatCtx, Type)->codec;
 }
 
-AVStream* cCodecToolKit::getFirstStream(AVFormatContext* FormatCtx, CodecType Type){
+AVStream* cCodecToolKit::getFirstStream(AVFormatContext* FormatCtx, AVMediaType Type){
     int Stream = -1; unsigned int i;
     for(i = 0; i < FormatCtx->nb_streams; i++){
         if(FormatCtx->streams[i]->codec->codec_type == Type){
diff -ruN upnp-old//dlna/profiles/ac3.cpp upnp-2009.11.19//dlna/profiles/ac3.cpp
--- upnp-old//dlna/profiles/ac3.cpp	2010-01-27 18:55:30.000000000 +0100
+++ upnp-2009.11.19//dlna/profiles/ac3.cpp	2011-10-26 07:26:19.000000000 +0200
@@ -49,7 +49,7 @@
 AcceptedSamplingRates   DLNA_SAMPLINGRATES_XAC3 = {{ KHz(48) }};
 
 AudioPortionProfile cAC3Profiler::probeAudioProfile(AVFormatContext* FormatCtx){
-    AVCodecContext* AudioCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, CODEC_TYPE_AUDIO);
+    AVCodecContext* AudioCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, AVMEDIA_TYPE_AUDIO);
 
     if(AudioCodec->codec_id == CODEC_ID_AC3){
         // VBR
diff -ruN upnp-old//dlna/profiles/mpa.cpp upnp-2009.11.19//dlna/profiles/mpa.cpp
--- upnp-old//dlna/profiles/mpa.cpp	2010-01-27 18:55:30.000000000 +0100
+++ upnp-2009.11.19//dlna/profiles/mpa.cpp	2011-10-26 07:27:20.000000000 +0200
@@ -56,7 +56,7 @@
 AcceptedAudioChannels       DLNA_AUDIOCHANNELS_MPEG1_L3X    = { 2, { CHANNEL_LAYOUT_10, CHANNEL_LAYOUT_20 }, false };
 
 AudioPortionProfile cMPEGAudioProfiler::probeAudioProfile(AVFormatContext* FormatCtx){
-    AVCodecContext* AudioCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, CODEC_TYPE_AUDIO);
+    AVCodecContext* AudioCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, AVMEDIA_TYPE_AUDIO);
 
     if(AudioCodec->codec_id == CODEC_ID_MP1){
         if(cCodecToolKit::matchesAcceptedBitrates(DLNA_BITRATES_MPEG1_L1_DVB, AudioCodec) &&
diff -ruN upnp-old//dlna/profiles/mpeg2.cpp upnp-2009.11.19//dlna/profiles/mpeg2.cpp
--- upnp-old//dlna/profiles/mpeg2.cpp	2010-01-27 18:55:30.000000000 +0100
+++ upnp-2009.11.19//dlna/profiles/mpeg2.cpp	2011-10-26 07:27:40.000000000 +0200
@@ -156,8 +156,8 @@
 }
 
 VideoPortionProfile cMPEG2Profiler::probeVideoProfile(AVFormatContext* FormatCtx){
-    AVCodecContext* VideoCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, CODEC_TYPE_VIDEO);
-    AVStream* VideoStream = cCodecToolKit::getFirstStream(FormatCtx, CODEC_TYPE_VIDEO);
+    AVCodecContext* VideoCodec = cCodecToolKit::getFirstCodecContext(FormatCtx, AVMEDIA_TYPE_VIDEO);
+    AVStream* VideoStream = cCodecToolKit::getFirstStream(FormatCtx, AVMEDIA_TYPE_VIDEO);
 
     MESSAGE(VERBOSE_METADATA, "Codec-ID:             %d", VideoCodec->codec_id);
     MESSAGE(VERBOSE_METADATA, "Codec-Name:           %s", VideoCodec->codec_name);
diff -ruN upnp-old//inc/avdetector.h upnp-2009.11.19//inc/avdetector.h
--- upnp-old//inc/avdetector.h	2010-01-27 18:55:30.000000000 +0100
+++ upnp-2009.11.19//inc/avdetector.h	2011-10-26 07:22:40.000000000 +0200
@@ -111,8 +111,8 @@
 
 class cCodecToolKit {
 public:
-    static AVCodecContext* getFirstCodecContext(AVFormatContext* FormatCtx, CodecType Type);
-    static AVStream* getFirstStream(AVFormatContext* FormatCtx, CodecType Type);
+    static AVCodecContext* getFirstCodecContext(AVFormatContext* FormatCtx, AVMediaType Type);
+    static AVStream* getFirstStream(AVFormatContext* FormatCtx, AVMediaType Type);
     static bool matchesAcceptedBitrates(AcceptedBitrates Bitrates, AVCodecContext* Codec);
     static bool matchesAcceptedSystemBitrate(AcceptedBitrates Bitrate, AVFormatContext* Format);
     static bool matchesAcceptedAudioChannels(AcceptedAudioChannels Channels, AVCodecContext* Codec);