diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:39:01 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-12-02 22:42:35 +0100 |
| commit | d76adfae9cbcdfcfba6a11936feff22f9360dd49 (patch) | |
| tree | afdc356e7f2e36d3ccd6d1bcd898da3c03fca9b2 | |
| parent | fc469e5c7f4ab477af17bc11e32472a29cf050db (diff) | |
| parent | 8f8caca2242e1fe05f37493cfabcd3f4de198550 (diff) | |
| download | ffmpeg-d76adfae9cbcdfcfba6a11936feff22f9360dd49.tar.gz | |
Merge commit '8f8caca2242e1fe05f37493cfabcd3f4de198550'
* commit '8f8caca2242e1fe05f37493cfabcd3f4de198550':
Add support for BDAV/m2ts-mode muxing
Conflicts:
libavformat/mpegtsenc.c
See: 09a858da7d5535e78e9cf942a468aec411ffbf19
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/mpegtsenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/mpegtsenc.c b/libavformat/mpegtsenc.c index 7670fc6238..a32c6d6787 100644 --- a/libavformat/mpegtsenc.c +++ b/libavformat/mpegtsenc.c @@ -577,7 +577,7 @@ static void mpegts_prefix_m2ts_header(AVFormatContext *s) uint32_t tp_extra_header = pcr % 0x3fffffff; tp_extra_header = AV_RB32(&tp_extra_header); avio_write(s->pb, (unsigned char *) &tp_extra_header, - sizeof(tp_extra_header)); + sizeof(tp_extra_header)); } } |