diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:20:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:36:38 +0200 |
| commit | ed962414bd66027ce67ded912c17e08970163f52 (patch) | |
| tree | 27a07264d5e7d5194c9a2df07882b8cdb75790a3 /libavcodec/rawdec.c | |
| parent | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (diff) | |
| parent | 92b099daf4b8ef93513e38b43899cb8458a2fde3 (diff) | |
Merge commit '92b099daf4b8ef93513e38b43899cb8458a2fde3'
* commit '92b099daf4b8ef93513e38b43899cb8458a2fde3':
swscale: support converting YVYU422 pixel format
Conflicts:
libswscale/input.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/rawdec.c')
0 files changed, 0 insertions, 0 deletions