[SCM] libav/experimental: Change a case of CODEC_TYPE_ into AVMEDIA_TYPE_ This was accidentally overwritten in the recent merge of the theora/vorbis codepaths

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sun Jun 30 17:05:38 UTC 2013


The following commit has been merged in the experimental branch:
commit 4bebf2cf64ef64ac419a9bbc6f2cdecbdb4c08a4
Author: Martin Storsjö <martin at martin.st>
Date:   Fri Apr 2 11:33:02 2010 +0000

    Change a case of CODEC_TYPE_ into AVMEDIA_TYPE_
    This was accidentally overwritten in the recent merge of the theora/vorbis codepaths
    
    Originally committed as revision 22774 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/rtpdec_xiph.c b/libavformat/rtpdec_xiph.c
index 1567b61..302f985 100644
--- a/libavformat/rtpdec_xiph.c
+++ b/libavformat/rtpdec_xiph.c
@@ -390,7 +390,7 @@ RTPDynamicProtocolHandler ff_theora_dynamic_handler = {
 
 RTPDynamicProtocolHandler ff_vorbis_dynamic_handler = {
     .enc_name         = "vorbis",
-    .codec_type       = CODEC_TYPE_AUDIO,
+    .codec_type       = AVMEDIA_TYPE_AUDIO,
     .codec_id         = CODEC_ID_VORBIS,
     .parse_sdp_a_line = xiph_parse_sdp_line,
     .open             = xiph_new_context,

-- 
Libav/FFmpeg packaging



More information about the pkg-multimedia-commits mailing list