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-03-10 23:33:57 +01:00
2015-07-07 22:56:30 +02:00
2015-04-20 04:11:23 +02:00
2015-02-21 20:38:13 +01:00
2015-06-04 23:10:56 +02:00
2015-06-14 15:09:33 +02:00
2015-04-29 20:13:59 +02:00
2015-04-18 14:14:24 -03:00
2015-04-18 14:14:11 -03:00
2015-06-24 14:45:16 +01:00
2015-05-06 17:50:09 +02:00
2015-05-28 16:10:56 +02:00
2015-03-14 14:05:25 +01:00
2015-06-06 16:02:19 +00:00
2015-05-28 01:01:16 +02:00
2015-06-19 13:57:36 +02:00
2015-06-08 19:11:27 +02:00
2015-06-28 14:51:07 +02:00
2015-07-17 00:16:45 +02:00
2015-05-31 15:03:31 +02:00
2015-05-25 16:08:08 +02:00
2015-06-24 15:09:31 -07:00
2015-05-31 15:03:31 +02:00
2015-07-14 18:00:36 +02:00
2015-05-20 15:50:58 +02:00
2015-06-17 20:11:43 +02:00
2015-07-01 20:30:48 +02:00
2015-06-26 23:35:26 +02:00
2015-07-10 16:21:50 +02:00
2015-03-16 13:04:47 +01:00
2015-07-17 00:16:45 +02:00
2015-05-13 00:41:38 +02:00
2015-04-18 18:07:54 -03:00
2015-05-31 15:03:31 +02:00