From: Baptiste Coudurier <baptiste.coudurier@gmail.com>
Date: Sat, 24 Mar 2007 15:24:36 +0000 (+0000)
Subject: cosmectics, mov -> mp4
X-Git-Tag: v0.5~9549
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=ccba88d764e71cf8ece8f4861fbceab6ed6e805a;p=coroid%2Flibav_saccubus.git

cosmectics, mov -> mp4

Originally committed as revision 8497 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavformat/isom.c b/libavformat/isom.c
index c86ae9833..c1a690ef2 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -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 },
diff --git a/libavformat/isom.h b/libavformat/isom.h
index 159f9c5e6..efcb1fc42 100644
--- a/libavformat/isom.h
+++ b/libavformat/isom.h
@@ -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[];
 
diff --git a/libavformat/mov.c b/libavformat/mov.c
index b256453fd..209cc74de 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -382,7 +382,7 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
         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) {
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index c5f777d02..e93416914 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -260,7 +260,7 @@ static int mov_write_esds_tag(ByteIOContext *pb, MOVTrack* track) // Basic
     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)