diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:07:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-09 03:07:47 +0200 |
| commit | 0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb (patch) | |
| tree | ac4bfa3f2e2fa0c0a7766633650516e0ac4247ef /doc/ffserver.texi | |
| parent | 352e13e2a9914c623fc53fab3ff49a21e9232674 (diff) | |
| parent | 8b17243d1742279bcb2368f8d325ea71e66736c8 (diff) | |
| download | ffmpeg-0a1cc04e6c09295cf06a1ca96d9a5a6e8bd85acb.tar.gz | |
Merge commit '8b17243d1742279bcb2368f8d325ea71e66736c8'
* commit '8b17243d1742279bcb2368f8d325ea71e66736c8':
lavu: Add packed YVYU422 pixel format
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc/ffserver.texi')
0 files changed, 0 insertions, 0 deletions