diff options
| author | Alex Converse <alex.converse@gmail.com> | 2011-10-05 10:59:15 -0700 |
|---|---|---|
| committer | Alex Converse <alex.converse@gmail.com> | 2011-10-28 14:54:13 -0700 |
| commit | 77b5c82b49dacfab9966df2d7532ae155478769e (patch) | |
| tree | b33a660595f6d6019d7e2e99f22576ad6b7ed381 | |
| parent | bc2dd36740ef13d1f95c243ff58167fafb3d9a51 (diff) | |
| download | ffmpeg-77b5c82b49dacfab9966df2d7532ae155478769e.tar.gz | |
isom: Add MPEG4SYSTEMS dummy object type indication.
| -rw-r--r-- | libavcodec/avcodec.h | 2 | ||||
| -rw-r--r-- | libavformat/isom.c | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 1c9bd96a5f..649bce488c 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -372,6 +372,8 @@ enum CodecID { CODEC_ID_MPEG2TS= 0x20000, /**< _FAKE_ codec to indicate a raw MPEG-2 TS * stream (only used by libavformat) */ + CODEC_ID_MPEG4SYSTEMS = 0x20001, /**< _FAKE_ codec to indicate a MPEG-4 Systems + * stream (only used by libavformat) */ CODEC_ID_FFMETADATA=0x21000, ///< Dummy codec for streams containing only metadata information. }; diff --git a/libavformat/isom.c b/libavformat/isom.c index c5b01f22e3..b0eef375c6 100644 --- a/libavformat/isom.c +++ b/libavformat/isom.c @@ -61,6 +61,8 @@ const AVCodecTag ff_mp4_obj_type[] = { { CODEC_ID_VORBIS , 0xDD }, /* non standard, gpac uses it */ { CODEC_ID_DVD_SUBTITLE, 0xE0 }, /* non standard, see unsupported-embedded-subs-2.mp4 */ { CODEC_ID_QCELP , 0xE1 }, + { CODEC_ID_MPEG4SYSTEMS, 0x01 }, + { CODEC_ID_MPEG4SYSTEMS, 0x02 }, { CODEC_ID_NONE , 0 }, }; |