RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075' 

* commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075':
  matroskadec: Support HEVC demuxing

Conflicts:
	Changelog
	libavformat/matroskadec.c
	libavformat/version.h

See: 16b6839de6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-01 17:57:57 +01:00
parent 3a0c902636 959bea13ce
commit 0fbeeb9399
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Changelog
View File

@ -49,8 +49,8 @@ version 2.1:
- Enhanced Low Delay AAC (ER AAC ELD) decoding (no LD SBR support)
- Linux framebuffer output device
- HEVC decoder
- raw HEVC, HEVC in MOV/MP4 demuxing
- HEVC demuxing in TS, Matroska
- raw HEVC, HEVC in MOV/MP4, HEVC in Matroska demuxing
- HEVC demuxing in TS
- mergeplanes filter

1
libavformat/matroskadec.c
View File

@ -1845,6 +1845,7 @@ static int matroska_read_header(AVFormatContext *s)
255);
if (st->codec->codec_id != AV_CODEC_ID_HEVC)
st->need_parsing = AVSTREAM_PARSE_HEADERS;
if (track->default_duration) {
av_reduce(&st->avg_frame_rate.num, &st->avg_frame_rate.den,
1000000000, track->default_duration, 30000);

2
libavformat/version.h
View File

@ -31,7 +31,7 @@
#define LIBAVFORMAT_VERSION_MAJOR 55
#define LIBAVFORMAT_VERSION_MINOR 20
#define LIBAVFORMAT_VERSION_MICRO 102
#define LIBAVFORMAT_VERSION_MICRO 103
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \