diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 22:03:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-01-06 22:05:06 +0100 |
| commit | 3b3782d74e5a5827e4a52f0be990decd6a303654 (patch) | |
| tree | f2c0f8efc9d4e06603d5f808d8a68934bfaac27f /libavformat/webvttenc.c | |
| parent | f4cc19cdd082aa07db2f6fd1c5fbc2b674a74a63 (diff) | |
| parent | 0352ff102d62ee94e79e0baaf64d5ad4e66f907b (diff) | |
| download | ffmpeg-3b3782d74e5a5827e4a52f0be990decd6a303654.tar.gz | |
Merge commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b'
* commit '0352ff102d62ee94e79e0baaf64d5ad4e66f907b':
ffv1: const correctness for encode_rgb_frame()
Conflicts:
libavcodec/ffv1enc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webvttenc.c')
0 files changed, 0 insertions, 0 deletions