diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:17:34 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:17:34 +0100 |
| commit | 4e276b84e697ec9c21cec1fb0a4b2ad7e8cbf4ed (patch) | |
| tree | eca61ff6a87c57b533b8134d66a0e7be5ea6591a /libavformat/webvttenc.c | |
| parent | b7697d29ed772dd94cb23400154d3e47e326d151 (diff) | |
| parent | 8058284ce09030b47512746d726fb2ad3ae8a20f (diff) | |
| download | ffmpeg-4e276b84e697ec9c21cec1fb0a4b2ad7e8cbf4ed.tar.gz | |
Merge commit '8058284ce09030b47512746d726fb2ad3ae8a20f'
* commit '8058284ce09030b47512746d726fb2ad3ae8a20f':
lavc: add 422/444 YUV with alpha to align_dimensions()
Conflicts:
libavcodec/utils.c
Only cosmetical changes happen as these formats already where in the list before
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/webvttenc.c')
0 files changed, 0 insertions, 0 deletions