ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Fri
Jul 17 13:48:40 2015 +0200| [441d5a7084b56fd9874daede2ef90356b3bf9d16] |
committer: Michael Niedermayer
Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'
* commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37':
h264: Add support for Closed Caption export
Conflicts:
libavcodec/h264.c
libavcodec/h264_sei.c
See: 8234f0e3b485811d60c228c40a94a141c46e61ca
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=441d5a7084b56fd9874daede2ef90356b3bf9d16
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
