1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
FFmpeg/libavcodec
Michael Niedermayer 441d5a7084 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 <michael@niedermayer.cc>
2015-07-17 14:13:19 +02:00
..
2015-07-07 22:56:30 +02:00
2015-06-28 14:51:07 +02:00
2015-07-17 00:16:45 +02:00
2015-07-14 18:00:36 +02:00
2015-07-01 20:30:48 +02:00
2015-07-10 16:21:50 +02:00
2015-07-17 00:16:45 +02:00