[FFmpeg-cvslog] Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'

Michael Niedermayer git at videolan.org
Fri Nov 1 18:04:12 CET 2013 

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 17:57:57 2013 +0100| [0fbeeb939915b69050d00feab93aa904d133ec5f] | committer: Michael Niedermayer

Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'

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

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

See: 16b6839de6767924c4640d6e9204b6eeb5c53910
Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0fbeeb939915b69050d00feab93aa904d133ec5f
---

More information about the ffmpeg-cvslog mailing list