[FFmpeg-cvslog] Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'

Michael Niedermayer git at videolan.org
Fri Nov 1 18:06:41 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Nov  1 18:04:44 2013 +0100| [6262763d8d6457dc9df09331ba24a4219cf56849] | committer: Michael Niedermayer

Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'

* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
  mpegts: Support HEVC demuxing

Conflicts:
	Changelog
	libavformat/version.h

See: 93c1fe4de3937df63c3d68e87dd7d2fabd5203c0
Merged-by: Michael Niedermayer <michaelni at gmx.at>

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





More information about the ffmpeg-cvslog mailing list