virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-15 14:13:16 +02:00
Code Issues Releases Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  matroskaenc: Allow chapters to be written in trailer

Conflicts:
	libavformat/matroskaenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2013-09-05 13:34:37 +02:00
parent b042712a87 26b241c079
commit 2230d85ceb
2 changed files with 20 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
libavformat/avformat.h
View File

@@ -1101,6 +1101,17 @@ typedef struct AVFormatContext {
*/ */
unsigned int max_picture_buffer; unsigned int max_picture_buffer;
/**
* Number of chapters in AVChapter array.
* When muxing, chapters are normally written in the file header,
* so nb_chapters should normally be initialized before write_header
* is called. Some muxers (e.g. mov and mkv) can also write chapters
* in the trailer. To write chapters in the trailer, nb_chapters
* must be zero when write_header is called and non-zero when
* write_trailer is called.
* muxing : set by user
* demuxing: set by libavformat
*/
unsigned int nb_chapters; unsigned int nb_chapters;
AVChapter **chapters; AVChapter **chapters;

10
libavformat/matroskaenc.c
View File

@@ -109,6 +109,7 @@ typedef struct MatroskaMuxContext {
int64_t cluster_time_limit; int64_t cluster_time_limit;
uint32_t chapter_id_offset; uint32_t chapter_id_offset;
int wrote_chapters;
} MatroskaMuxContext; } MatroskaMuxContext;
@@ -790,7 +791,7 @@ static int mkv_write_chapters(AVFormatContext *s)
AVRational scale = {1, 1E9}; AVRational scale = {1, 1E9};
int i, ret; int i, ret;
if (!s->nb_chapters) if (!s->nb_chapters || mkv->wrote_chapters)
return 0; return 0;
ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CHAPTERS, avio_tell(pb)); ret = mkv_add_seekhead_entry(mkv->main_seekhead, MATROSKA_ID_CHAPTERS, avio_tell(pb));
@@ -823,6 +824,8 @@ static int mkv_write_chapters(AVFormatContext *s)
} }
end_ebml_master(pb, editionentry); end_ebml_master(pb, editionentry);
end_ebml_master(pb, chapters); end_ebml_master(pb, chapters);
mkv->wrote_chapters = 1;
return 0; return 0;
} }
@@ -1610,6 +1613,11 @@ static int mkv_write_trailer(AVFormatContext *s)
end_ebml_master(pb, mkv->cluster); end_ebml_master(pb, mkv->cluster);
} }
if (mkv->mode != MODE_WEBM) {
ret = mkv_write_chapters(s);
if (ret < 0) return ret;
}
if (pb->seekable) { if (pb->seekable) {
if (mkv->cues->num_entries) { if (mkv->cues->num_entries) {
if (mkv->reserve_cues_space) { if (mkv->reserve_cues_space) {