diff options
| author | Baptiste Coudurier <[email protected]> | 2006-02-11 18:27:57 +0000 |
|---|---|---|
| committer | Michael Niedermayer <[email protected]> | 2006-02-11 18:27:57 +0000 |
| commit | e60b4ced1fe43a270ef425ed4966cb1a77162322 (patch) | |
| tree | a675aeb2ebb6e479752f1795c01c1c0b994d44a3 /libavformat/movenc.c | |
| parent | f29f3b5d9ff5cc3b70dac295c9589577ce1a41c7 (diff) | |
mp4 codecs objecttype handling patch by (Baptiste COUDURIER <baptiste.coudurier smartjog com)
Originally committed as revision 4982 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8aed24857e..99ce8bcb98 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -20,6 +20,7 @@ #include "avformat.h" #include "avi.h" #include "avio.h" +#include "mov.h" #undef NDEBUG #include <assert.h> @@ -77,26 +78,6 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track); /* output language code from iso639 language name */ extern int ff_mov_iso639_to_lang(const char *lang, int mp4); -const CodecTag ff_mov_obj_type[] = { - { CODEC_ID_MPEG4 , 32 }, - { CODEC_ID_AAC , 64 }, - { CODEC_ID_MPEG1VIDEO, 106 }, - { CODEC_ID_MPEG2VIDEO, 96 },//mpeg2 profiles - { CODEC_ID_MP2 , 107 },//FIXME mpeg2 mpeg audio -> 105 - { CODEC_ID_MP3 , 107 },//FIXME mpeg2 mpeg audio -> 105 - { CODEC_ID_H264 , 33 }, - { CODEC_ID_H263 , 242 }, - { CODEC_ID_H261 , 243 }, - { CODEC_ID_MJPEG , 108 }, - { CODEC_ID_PCM_S16LE , 224 }, - { CODEC_ID_VORBIS , 225 }, - { CODEC_ID_AC3 , 226 }, - { CODEC_ID_PCM_ALAW , 227 }, - { CODEC_ID_PCM_MULAW , 228 }, - { CODEC_ID_PCM_S16BE , 230 }, - { 0,0 }, -}; - //FIXME supprt 64bit varaint with wide placeholders static offset_t updateSize (ByteIOContext *pb, offset_t pos) { |