diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 13:48:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 14:13:19 +0200 |
| commit | 441d5a7084b56fd9874daede2ef90356b3bf9d16 (patch) | |
| tree | 8bce92071141b185bcd67abbb0cc1cf9429340b5 /libavcodec/pnmdec.c | |
| parent | ec6bef68f14f08e1295ea9c65fcb8b3f2e53193e (diff) | |
| parent | b0017579b6e8de3d0d13dcfe0a4dd848dc6baa37 (diff) | |
| download | ffmpeg-441d5a7084b56fd9874daede2ef90356b3bf9d16.tar.gz | |
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>
Diffstat (limited to 'libavcodec/pnmdec.c')
0 files changed, 0 insertions, 0 deletions