oggdec: add support for demuxing of Opus packets.

added CODEC_ID_OPUS in libavcodec.
justinruggles · Nov 17, 2011 · feefb59 · feefb59
1 parent 92db95e
commit feefb59
Show file tree

Hide file tree

Showing 7 changed files with 460 additions and 2 deletions.
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
@@ -363,6 +363,7 @@ enum CodecID {
     CODEC_ID_8SVX_FIB,
 #endif
     CODEC_ID_BMV_AUDIO,
+    CODEC_ID_OPUS,
 
     /* subtitle codecs */
     CODEC_ID_FIRST_SUBTITLE = 0x17000,          ///< A dummy ID pointing at the start of subtitle codecs.

diff --git a/libavcodec/version.h b/libavcodec/version.h
@@ -21,7 +21,7 @@
 #define AVCODEC_VERSION_H
 
 #define LIBAVCODEC_VERSION_MAJOR 53
-#define LIBAVCODEC_VERSION_MINOR 20
+#define LIBAVCODEC_VERSION_MINOR 21
 #define LIBAVCODEC_VERSION_MICRO  0
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \

diff --git a/libavformat/Makefile b/libavformat/Makefile
@@ -168,6 +168,7 @@ OBJS-$(CONFIG_OGG_DEMUXER)               += oggdec.o         \
                                             oggparsedirac.o  \
                                             oggparseflac.o   \
                                             oggparseogm.o    \
+                                            oggparseopus.o   \
                                             oggparseskeleton.o \
                                             oggparsespeex.o  \
                                             oggparsetheora.o \

diff --git a/libavformat/oggdec.c b/libavformat/oggdec.c
@@ -47,6 +47,7 @@ static const struct ogg_codec * const ogg_codecs[] = {
     &ff_theora_codec,
     &ff_flac_codec,
     &ff_celt_codec,
+    &ff_opus_codec,
     &ff_old_dirac_codec,
     &ff_old_flac_codec,
     &ff_ogm_video_codec,

diff --git a/libavformat/oggdec.h b/libavformat/oggdec.h
@@ -107,6 +107,7 @@ extern const struct ogg_codec ff_ogm_text_codec;
 extern const struct ogg_codec ff_ogm_video_codec;
 extern const struct ogg_codec ff_old_dirac_codec;
 extern const struct ogg_codec ff_old_flac_codec;
+extern const struct ogg_codec ff_opus_codec;
 extern const struct ogg_codec ff_skeleton_codec;
 extern const struct ogg_codec ff_speex_codec;
 extern const struct ogg_codec ff_theora_codec;