Skip to content

F
ffmpeg.wasm-core
Commit 5df8a0c6 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

group audio codec ids 

Originally committed as revision 4017 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9e42e70c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
libavcodec/avcodec.h
View file @ 5df8a0c6
...@@ -17,7 +17,7 @@ extern "C" { ...@@ -17,7 +17,7 @@ extern "C" {
#define FFMPEG_VERSION_INT 0x000409 #define FFMPEG_VERSION_INT 0x000409
#define FFMPEG_VERSION "0.4.9-pre1" #define FFMPEG_VERSION "0.4.9-pre1"
#define LIBAVCODEC_BUILD 4745 #define LIBAVCODEC_BUILD 4746
#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
#define LIBAVCODEC_VERSION FFMPEG_VERSION #define LIBAVCODEC_VERSION FFMPEG_VERSION
...@@ -165,12 +165,12 @@ enum CodecID { ...@@ -165,12 +165,12 @@ enum CodecID {
CODEC_ID_MP3ADU, CODEC_ID_MP3ADU,
CODEC_ID_MP3ON4, CODEC_ID_MP3ON4,
CODEC_ID_SHORTEN, CODEC_ID_SHORTEN,
CODEC_ID_ALAC,
CODEC_ID_OGGTHEORA= 0x16000, CODEC_ID_OGGTHEORA= 0x16000,
CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport CODEC_ID_MPEG2TS= 0x20000, /* _FAKE_ codec to indicate a raw MPEG2 transport
stream (only used by libavformat) */ stream (only used by libavformat) */
CODEC_ID_ALAC,
}; };
/* CODEC_ID_MP3LAME is absolete */ /* CODEC_ID_MP3LAME is absolete */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment