ffmpeg | branch: master | Michael Niedermayer <[email protected]> | 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 <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=2e2e6b1be5913f64830cae1538696601c61c80d0
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
