mirror of https://git.videolan.org/git/ffmpeg.git
Prevent mov muxer from writing empty udta atoms.
Originally committed as revision 10852 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
8862fb41e0
commit
89a0d7908b
|
@ -1220,8 +1220,23 @@ static int mov_write_meta_tag(ByteIOContext *pb, MOVContext* mov,
|
||||||
static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
|
static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
|
||||||
AVFormatContext *s)
|
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);
|
offset_t pos = url_ftell(pb);
|
||||||
int i;
|
|
||||||
|
|
||||||
put_be32(pb, 0); /* size */
|
put_be32(pb, 0); /* size */
|
||||||
put_tag(pb, "udta");
|
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
|
if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
|
||||||
/* Requirements */
|
/* Requirements */
|
||||||
for (i=0; i<mov->nb_streams; i++) {
|
if (req)
|
||||||
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) {
|
|
||||||
mov_write_string_tag(pb, "\251req", "QuickTime 6.0 or greater", 0);
|
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, "\251nam", s->title , 0);
|
||||||
mov_write_string_tag(pb, "\251aut", s->author , 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 updateSize(pb, pos);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int utf8len(uint8_t *b){
|
static int utf8len(uint8_t *b){
|
||||||
|
|
Loading…
Reference in New Issue