@@ -134,7 +134,7 @@ AVCodec ff_libshine_encoder = {

     .name                  = "libshine",

     .long_name             = NULL_IF_CONFIG_SMALL("libshine MP3 (MPEG audio layer 3)"),

     .type                  = AVMEDIA_TYPE_AUDIO,

-    .id                    = CODEC_ID_MP3,

+    .id                    = AV_CODEC_ID_MP3,

     .priv_data_size        = sizeof(SHINEContext),

     .init                  = libshine_encode_init,

     .encode2               = libshine_encode_frame,

@@ -459,7 +459,7 @@ AVCodec ff_libzvbi_teletext_decoder = {

     .name      = "libzvbi_teletextdec",

     .long_name = NULL_IF_CONFIG_SMALL("Libzvbi DVB teletext decoder"),

     .type      = AVMEDIA_TYPE_SUBTITLE,

-    .id        = CODEC_ID_DVB_TELETEXT,

+    .id        = AV_CODEC_ID_DVB_TELETEXT,

     .priv_data_size = sizeof(TeletextContext),

     .init      = teletext_init_decoder,

     .close     = teletext_close_decoder,

@@ -165,7 +165,7 @@ AVCodec ff_s302m_encoder = {

     .name                  = "s302m",

     .long_name             = NULL_IF_CONFIG_SMALL("SMPTE 302M"),

     .type                  = AVMEDIA_TYPE_AUDIO,

-    .id                    = CODEC_ID_S302M,

+    .id                    = AV_CODEC_ID_S302M,

     .priv_data_size        = sizeof(S302MEncContext),

     .init                  = s302m_encode_init,

     .encode2               = s302m_encode2_frame,