diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 20:39:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-19 20:39:05 +0100 |
| commit | bd9e0127c9fbfc18f1a663483d9388d69a1581f6 (patch) | |
| tree | 982ca15574c5bfe5614e615e67b723ed09c60774 /libswscale/rgb2rgb.h | |
| parent | dde16f5aaed327e15049b40a8dfae1f59647e4ec (diff) | |
| parent | 92ebb332157195b7c1212e734c5668afbf19cf2b (diff) | |
| download | ffmpeg-bd9e0127c9fbfc18f1a663483d9388d69a1581f6.tar.gz | |
Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'
* commit '92ebb332157195b7c1212e734c5668afbf19cf2b':
mxf: Add additional H264 PictureEssenceCoding
Conflicts:
libavformat/mxf.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/rgb2rgb.h')
0 files changed, 0 insertions, 0 deletions