Mercurial > libavformat.hg
changeset 1948:80d330650d35 libavformat
cosmectics, mov -> mp4
| author | bcoudurier |
|---|---|
| date | Sat, 24 Mar 2007 15:24:36 +0000 |
| parents | cf875ab73dce |
| children | 18891c1e3e46 |
| files | isom.c isom.h mov.c movenc.c |
| diffstat | 4 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/isom.c Sat Mar 24 15:17:30 2007 +0000 +++ b/isom.c Sat Mar 24 15:24:36 2007 +0000 @@ -26,7 +26,7 @@ #include "isom.h" /* http://www.mp4ra.org */ -const AVCodecTag ff_mov_obj_type[] = { +const AVCodecTag ff_mp4_obj_type[] = { { CODEC_ID_MPEG4 , 32 }, { CODEC_ID_H264 , 33 }, { CODEC_ID_AAC , 64 },
--- a/isom.h Sat Mar 24 15:17:30 2007 +0000 +++ b/isom.h Sat Mar 24 15:24:36 2007 +0000 @@ -25,7 +25,7 @@ #define FFMPEG_ISOM_H /* isom.c */ -extern const AVCodecTag ff_mov_obj_type[]; +extern const AVCodecTag ff_mp4_obj_type[]; extern const AVCodecTag codec_movvideo_tags[]; extern const AVCodecTag codec_movaudio_tags[];
--- a/mov.c Sat Mar 24 15:17:30 2007 +0000 +++ b/mov.c Sat Mar 24 15:24:36 2007 +0000 @@ -382,7 +382,7 @@ sc->esds.max_bitrate = get_be32(pb); sc->esds.avg_bitrate = get_be32(pb); - st->codec->codec_id= codec_get_id(ff_mov_obj_type, sc->esds.object_type_id); + st->codec->codec_id= codec_get_id(ff_mp4_obj_type, sc->esds.object_type_id); dprintf(c->fc, "esds object type id %d\n", sc->esds.object_type_id); len = mov_mp4_read_descr(c, pb, &tag); if (tag == MP4DecSpecificDescrTag) {
--- a/movenc.c Sat Mar 24 15:17:30 2007 +0000 +++ b/movenc.c Sat Mar 24 15:24:36 2007 +0000 @@ -260,7 +260,7 @@ putDescr(pb, 0x04, 13 + decoderSpecificInfoLen); // Object type indication - put_byte(pb, codec_get_tag(ff_mov_obj_type, track->enc->codec_id)); + put_byte(pb, codec_get_tag(ff_mp4_obj_type, track->enc->codec_id)); // the following fields is made of 6 bits to identify the streamtype (4 for video, 5 for audio) // plus 1 bit to indicate upstream and 1 bit set to 1 (reserved)