eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 18:10:13 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f90729699db9ede2bef2b28000f1795dab1b8996'

Browse Source 
* commit 'f90729699db9ede2bef2b28000f1795dab1b8996':
  mov: Do not group tracks if more than one is enabled per type

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-07-11 12:41:57 +02:00
parent e1f4397e74 f90729699d
commit 4c91599484
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/movenc.h
View File

@@ -176,6 +176,8 @@ typedef struct MOVMuxContext {
int64_t reserved_moov_pos;
char *major_brand;
int per_stream_grouping;
} MOVMuxContext;
#define FF_MOV_FLAG_RTP_HINT 1