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