[FFmpeg-cvslog] avcodec: fix old codec ids

Michael Niedermayer git at videolan.org
Mon Oct 28 23:55:44 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Oct 28 23:45:26 2013 +0100| [e510171f31b985113d058e4c12f20b723018456c] | committer: Michael Niedermayer

avcodec: fix old codec ids

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e510171f31b985113d058e4c12f20b723018456c
---

 libavcodec/libshine.c            |    2 +-
 libavcodec/libzvbi-teletextdec.c |    2 +-
 libavcodec/s302menc.c            |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/libavcodec/libshine.c b/libavcodec/libshine.c
index 2418188..48333bb 100644
--- a/libavcodec/libshine.c
+++ b/libavcodec/libshine.c
@@ -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,
diff --git a/libavcodec/libzvbi-teletextdec.c b/libavcodec/libzvbi-teletextdec.c
index 2f6714c..8b504b5 100644
--- a/libavcodec/libzvbi-teletextdec.c
+++ b/libavcodec/libzvbi-teletextdec.c
@@ -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,
diff --git a/libavcodec/s302menc.c b/libavcodec/s302menc.c
index c428d54..a7e5b1d 100644
--- a/libavcodec/s302menc.c
+++ b/libavcodec/s302menc.c
@@ -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,



More information about the ffmpeg-cvslog mailing list