projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 9.38.198.0
[platform/framework/web/crosswalk.git]
/
src
/
third_party
/
ffmpeg
/
libavformat
/
movenc.h
diff --git
a/src/third_party/ffmpeg/libavformat/movenc.h
b/src/third_party/ffmpeg/libavformat/movenc.h
index
fce2d3c
..
6ebe265
100644
(file)
--- a/
src/third_party/ffmpeg/libavformat/movenc.h
+++ b/
src/third_party/ffmpeg/libavformat/movenc.h
@@
-98,8
+98,9
@@
typedef struct MOVTrack {
int language;
int track_id;
int tag; ///< stsd fourcc
int language;
int track_id;
int tag; ///< stsd fourcc
- AVStream *st;
+ AVStream
*st;
AVCodecContext *enc;
AVCodecContext *enc;
+ int multichannel_as_mono;
int vos_len;
uint8_t *vos_data;
int vos_len;
uint8_t *vos_data;
@@
-176,6
+177,8
@@
typedef struct MOVMuxContext {
int64_t reserved_moov_pos;
char *major_brand;
int64_t reserved_moov_pos;
char *major_brand;
+
+ int per_stream_grouping;
} MOVMuxContext;
#define FF_MOV_FLAG_RTP_HINT 1
} MOVMuxContext;
#define FF_MOV_FLAG_RTP_HINT 1