← Back to branch summary

~ubuntu-branches/ubuntu/trusty/libav/trusty

« back to all changes in this revision

Viewing changes to libavformat/matroskaenc.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler, Jonathan Nieder, Reinhard Tartler
  • Date: 2011-05-13 12:31:33 UTC
  • mfrom: (1.2.2 upstream)
  • mto: (1.3.4 sid)
  • mto: This revision was merged to the branch mainline in revision 4.
  • Revision ID: james.westby@ubuntu.com-20110513123133-zqcsj91sf5489y4s
Tags: 4:0.7~beta2-1
[ Jonathan Nieder ]
* only install doc/APIChanges in *-dev and libav-doc packages
* move note on source package lineage to README.Debian
* install NEWS.Debian in libavcodec-dev
* use dpkg source format 3.0 (quilt)
* allow "debian/rules clean" as unprivileged user

[ Reinhard Tartler ]
* New upstream release

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/matroskaenc.c
403
403
    }
404
404
    end_ebml_master(pb, cues_element);
405
405
 
406
 
    av_free(cues->entries);
407
 
    av_free(cues);
408
406
    return currentpos;
409
407
}
410
408
 
618
616
                put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_SUBTITLE);
619
617
                break;
620
618
            default:
621
 
                av_log(s, AV_LOG_ERROR, "Only audio, video, and subtitles are supported for Matroska.");
 
619
                av_log(s, AV_LOG_ERROR, "Only audio, video, and subtitles are supported for Matroska.\n");
622
620
                break;
623
621
        }
624
622
        ret = mkv_write_codecprivate(s, pb, codec, native_id, qt_id);
1160
1158
 
1161
1159
    end_ebml_master(pb, mkv->segment);
1162
1160
    av_free(mkv->tracks);
 
1161
    av_freep(&mkv->cues->entries);
 
1162
    av_freep(&mkv->cues);
1163
1163
    av_destruct_packet(&mkv->cur_audio_pkt);
1164
1164
    avio_flush(pb);
1165
1165
    return 0;