[FFmpeg-cvslog] Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'

Michael Niedermayer git at videolan.org
Tue Aug 5 13:57:22 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Aug  5 13:52:32 2014 +0200| [2e2e6b1be5913f64830cae1538696601c61c80d0] | committer: Michael Niedermayer

Merge commit '2601a9447efb778930b01ac58d2cc1d02498db4e'

* commit '2601a9447efb778930b01ac58d2cc1d02498db4e':
  mpegts: Add HEVC definitions

Conflicts:
	libavformat/mpegts.h

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

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





More information about the ffmpeg-cvslog mailing list