diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-15 13:28:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-15 13:28:38 +0100 |
| commit | 231795270b67496e01ad87731e0e95853146f038 (patch) | |
| tree | faa735beb3fe1e0c3c05de3881222c86d72e4839 /libavformat/mpeg.h | |
| parent | 9df00574fca16b3c8aa9892f9a3ed5bd6482833a (diff) | |
| parent | b164d66e35d349de414e2f0d7365a147aba8a620 (diff) | |
| download | ffmpeg-231795270b67496e01ad87731e0e95853146f038.tar.gz | |
Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'
* commit 'b164d66e35d349de414e2f0d7365a147aba8a620':
ape: make version-dependent decoding functions called via pointers
mpegts: add support for stream_type 0x42, which is CAVS
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/mpeg.h')
| -rw-r--r-- | libavformat/mpeg.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libavformat/mpeg.h b/libavformat/mpeg.h index ca019c9eb2..a1e89806ff 100644 --- a/libavformat/mpeg.h +++ b/libavformat/mpeg.h @@ -54,6 +54,7 @@ #define STREAM_TYPE_AUDIO_AAC 0x0f #define STREAM_TYPE_VIDEO_MPEG4 0x10 #define STREAM_TYPE_VIDEO_H264 0x1b +#define STREAM_TYPE_VIDEO_CAVS 0x42 #define STREAM_TYPE_AUDIO_AC3 0x81 #define STREAM_TYPE_AUDIO_DTS 0x8a |