RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-08 00:00:49 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'cehoyos/master'

Browse Source 
* cehoyos/master:
  movenc: Do not flag secondary audio and subtitle tracks as enabled.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-03-03 14:04:48 +01:00
commit 3fac99cd9d
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavformat/movenc.c
View File

@ -1602,7 +1602,7 @@ static int mov_write_tkhd_tag(AVIOContext *pb, MOVTrack *track, AVStream *st)
(version == 1) ? avio_wb32(pb, 104) : avio_wb32(pb, 92); /* size */ (version == 1) ? avio_wb32(pb, 104) : avio_wb32(pb, 92); /* size */
ffio_wfourcc(pb, "tkhd"); ffio_wfourcc(pb, "tkhd");
avio_w8(pb, version); avio_w8(pb, version);
avio_wb24(pb, 0xf); /* flags (track enabled) */ avio_wb24(pb, track->secondary ? 0x2 : 0xf); /* flags (first track enabled) */
if (version == 1) { if (version == 1) {
avio_wb64(pb, track->time); avio_wb64(pb, track->time);
avio_wb64(pb, track->time); avio_wb64(pb, track->time);
@ -2315,6 +2315,7 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov,
{ {
int i; int i;
int64_t pos = avio_tell(pb); int64_t pos = avio_tell(pb);
int not_first[AVMEDIA_TYPE_NB]={0};
avio_wb32(pb, 0); /* size placeholder*/ avio_wb32(pb, 0); /* size placeholder*/
ffio_wfourcc(pb, "moov"); ffio_wfourcc(pb, "moov");
@ -2355,6 +2356,13 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov,
mov_write_iods_tag(pb, mov); mov_write_iods_tag(pb, mov);
for (i=0; i<mov->nb_streams; i++) { for (i=0; i<mov->nb_streams; i++) {
if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_FRAGMENT) { if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_FRAGMENT) {
if(i < s->nb_streams){
int codec_type= s->streams[i]->codec->codec_type;
if(codec_type==AVMEDIA_TYPE_AUDIO || codec_type==AVMEDIA_TYPE_SUBTITLE){
mov->tracks[i].secondary= not_first[codec_type];
not_first[codec_type]= 1;
}
}
mov_write_trak_tag(pb, mov, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL); mov_write_trak_tag(pb, mov, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL);
} }
} }

1
libavformat/movenc.h
View File

@ -94,6 +94,7 @@ typedef struct MOVIndex {
#define MOV_TIMECODE_FLAG_ALLOWNEGATIVE 0x0004 #define MOV_TIMECODE_FLAG_ALLOWNEGATIVE 0x0004
uint32_t timecode_flags; uint32_t timecode_flags;
int language; int language;
int secondary;
int track_id; int track_id;
int tag; ///< stsd fourcc int tag; ///< stsd fourcc
AVCodecContext *enc; AVCodecContext *enc;