[SCM] libav/experimental: cosmetics: mov_mp4 -> mp4

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9e40addd21bcedf7b36e8a49b0a5cfac75ce5054
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sat Apr 21 18:12:51 2007 +0000

    cosmetics: mov_mp4 -> mp4
    
    Originally committed as revision 8773 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index 24d5ed5..8d64db1 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -254,7 +254,7 @@ static int mov_read_hdlr(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
     return 0;
 }
 
-static int mov_mp4_read_descr_len(ByteIOContext *pb)
+static int mp4_read_descr_len(ByteIOContext *pb)
 {
     int len = 0;
     int count = 4;
@@ -267,11 +267,11 @@ static int mov_mp4_read_descr_len(ByteIOContext *pb)
     return len;
 }
 
-static int mov_mp4_read_descr(MOVContext *c, ByteIOContext *pb, int *tag)
+static int mp4_read_descr(MOVContext *c, ByteIOContext *pb, int *tag)
 {
     int len;
     *tag = get_byte(pb);
-    len = mov_mp4_read_descr_len(pb);
+    len = mp4_read_descr_len(pb);
     dprintf(c->fc, "MPEG4 description: tag=0x%02x len=%d\n", *tag, len);
     return len;
 }
@@ -287,14 +287,14 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
     /* Well, broken but suffisant for some MP4 streams */
     get_be32(pb); /* version + flags */
-    len = mov_mp4_read_descr(c, pb, &tag);
+    len = mp4_read_descr(c, pb, &tag);
     if (tag == MP4ESDescrTag) {
         get_be16(pb); /* ID */
         get_byte(pb); /* priority */
     } else
         get_be16(pb); /* ID */
 
-    len = mov_mp4_read_descr(c, pb, &tag);
+    len = mp4_read_descr(c, pb, &tag);
     if (tag == MP4DecConfigDescrTag) {
         int object_type_id = get_byte(pb);
         get_byte(pb); /* stream type */
@@ -304,7 +304,7 @@ static int mov_read_esds(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
 
         st->codec->codec_id= codec_get_id(ff_mp4_obj_type, object_type_id);
         dprintf(c->fc, "esds object type id %d\n", object_type_id);
-        len = mov_mp4_read_descr(c, pb, &tag);
+        len = mp4_read_descr(c, pb, &tag);
         if (tag == MP4DecSpecificDescrTag) {
             dprintf(c->fc, "Specific MPEG4 header len=%d\n", len);
             st->codec->extradata = av_mallocz(len + FF_INPUT_BUFFER_PADDING_SIZE);

-- 
Libav/FFmpeg packaging