comparison movenc.c @ 2668:8d400e382d6e libavformat

Prevent mov muxer from writing empty udta atoms.

2667:e896ac505ec6

}

static int mov_write_udta_tag(ByteIOContext *pb, MOVContext* mov,
                              AVFormatContext *s)
{
    offset_t pos = url_ftell(pb);
    int i;

    put_be32(pb, 0); /* size */
    put_tag(pb, "udta");

    /* iTunes meta data */
    mov_write_meta_tag(pb, mov, s);

    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) {
                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);
        mov_write_string_tag(pb, "\251alb", s->album         , 0);
        mov_write_day_tag(pb, s->year, 0);

        mov_write_string_tag(pb, "\251des", s->comment       , 0);
        mov_write_string_tag(pb, "\251gen", s->genre         , 0);
    }

    return updateSize(pb, pos);
}

static int utf8len(uint8_t *b){
    int len=0;
    int val;

2668:8d400e382d6e

}

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);

    put_be32(pb, 0); /* size */
    put_tag(pb, "udta");

    /* iTunes meta data */
    mov_write_meta_tag(pb, mov, s);

    if(mov->mode == MODE_MOV){ // the title field breaks gtkpod with mp4 and my suspicion is that stuff is not valid in mp4
        /* Requirements */
        if (req)
                mov_write_string_tag(pb, "\251req", "QuickTime 6.0 or greater", 0);

        mov_write_string_tag(pb, "\251nam", s->title         , 0);
        mov_write_string_tag(pb, "\251aut", s->author        , 0);
        mov_write_string_tag(pb, "\251alb", s->album         , 0);
        mov_write_day_tag(pb, s->year, 0);

        mov_write_string_tag(pb, "\251des", s->comment       , 0);
        mov_write_string_tag(pb, "\251gen", s->genre         , 0);
    }

    return updateSize(pb, pos);
    }

    return 0;
}

static int utf8len(uint8_t *b){
    int len=0;
    int val;