Merge commit 'b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37'
authorMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 11:48:40 +0000 (13:48 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Fri, 17 Jul 2015 12:13:19 +0000 (14:13 +0200)
commit441d5a7084b56fd9874daede2ef90356b3bf9d16
tree8bce92071141b185bcd67abbb0cc1cf9429340b5
parentec6bef68f14f08e1295ea9c65fcb8b3f2e53193e
parentb0017579b6e8de3d0d13dcfe0a4dd848dc6baa37
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>
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_sei.c