diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-21 14:07:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-21 14:07:41 +0200 |
| commit | 8ad2465987d31bb818235303c0b02b897cd02133 (patch) | |
| tree | da7e3f47944830550e476b0422ec0ae5134abe20 /libavformat/matroska.h | |
| parent | ac82155204f1587f1f900c734ce316c36f2430cb (diff) | |
| parent | 79209f5d6ca31c73260f1c5f5dbaa8395102d9f1 (diff) | |
| download | ffmpeg-8ad2465987d31bb818235303c0b02b897cd02133.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow encoding YUVJ422P and YUVJ444P with libx264.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroska.h')
0 files changed, 0 insertions, 0 deletions