[Ffmpeg-cvslog] r8497 - in trunk/libavformat: isom.c isom.h mov.c movenc.c

[bcoudurier]

Author: bcoudurier
Date: Sat Mar 24 16:24:36 2007
New Revision: 8497

Modified:
   trunk/libavformat/isom.c
   trunk/libavformat/isom.h
   trunk/libavformat/mov.c
   trunk/libavformat/movenc.c

Log:
cosmectics, mov -> mp4

Modified: trunk/libavformat/isom.c
==============================================================================
--- trunk/libavformat/isom.c	(original)
+++ trunk/libavformat/isom.c	Sat Mar 24 16:24:36 2007
@@ -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 },

Modified: trunk/libavformat/isom.h
==============================================================================
--- trunk/libavformat/isom.h	(original)
+++ trunk/libavformat/isom.h	Sat Mar 24 16:24:36 2007
@@ -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[];
 

Modified: trunk/libavformat/mov.c
==============================================================================
--- trunk/libavformat/mov.c	(original)
+++ trunk/libavformat/mov.c	Sat Mar 24 16:24:36 2007
@@ -382,7 +382,7 @@ static int mov_read_esds(MOVContext *c, 
         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) {

Modified: trunk/libavformat/movenc.c
==============================================================================
--- trunk/libavformat/movenc.c	(original)
+++ trunk/libavformat/movenc.c	Sat Mar 24 16:24:36 2007
@@ -260,7 +260,7 @@ static int mov_write_esds_tag(ByteIOCont
     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)