[FFmpeg-cvslog] Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'

Michael Niedermayer git at videolan.org
Tue Feb 24 23:38:02 CET 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 24 23:30:51 2015 +0100| [cf95877474ad8add55126db746f6818b47f71f37] | committer: Michael Niedermayer

Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'

* commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb':
  rtpenc: Merge the h264 and hevc packetizers

Conflicts:
	libavformat/rtpenc_hevc.c

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

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





More information about the ffmpeg-cvslog mailing list