[SCM] libav/experimental: Prevent mov muxer from writing empty udta atoms.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 89a0d7908b58b5bea856ed5c2713babb5632cd84
Author: Benoit Fouet <benoit.fouet at free.fr>
Date:   Wed Oct 24 14:20:15 2007 +0000

    Prevent mov muxer from writing empty udta atoms.
    
    Originally committed as revision 10852 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index b4fb234..a29ad1f 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -1220,8 +1220,23 @@ static int mov_write_meta_tag(ByteIOContext *pb, MOVContext* mov,
 static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
                               AVFormatContext *s)
 {
+    int i, req = 0;
+
+    /* Requirements */
+    for (i=0; i<mov->nb_streams; i++) {
+        if(mov->tracks[i].entry <= 0) continue;
+        if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC ||
+            mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) {
+            req = 1;
+            break;
+        }
+    }
+
+    if (s->title[0]   || s->author[0] || s->album[0] || s->year ||
+        s->comment[0] || s->genre[0]  || s->track ||
+       (mov->mode == MODE_MOV &&
+      ((mov->tracks[0].enc && !mov->tracks[0].enc->flags & CODEC_FLAG_BITEXACT) || req))) {
     offset_t pos = url_ftell(pb);
-    int i;
 
     put_be32(pb, 0); /* size */
     put_tag(pb, "udta");
@@ -1231,14 +1246,8 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
 
     if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
         /* Requirements */
-        for (i=0; i<mov->nb_streams; i++) {
-            if(mov->tracks[i].entry <= 0) continue;
-            if (mov->tracks[i].enc->codec_id == CODEC_ID_AAC ||
-                mov->tracks[i].enc->codec_id == CODEC_ID_MPEG4) {
+        if (req)
                 mov_write_string_tag(pb, "\251req", "QuickTime 6.0 or greater", 0);
-                break;
-            }
-        }
 
         mov_write_string_tag(pb, "\251nam", s->title         , 0);
         mov_write_string_tag(pb, "\251aut", s->author        , 0);
@@ -1251,6 +1260,9 @@ static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
     }
 
     return updateSize(pb, pos);
+    }
+
+    return 0;
 }
 
 static int utf8len(uint8_t *b){

-- 
Libav/FFmpeg packaging