diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:41:42 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 12:41:42 +0100 |
| commit | f4f7888bab7061f08c54356c285adaba24383dc0 (patch) | |
| tree | cc1b39e0754ac80908cf929f71e5127b83174c48 /libavcodec/jpegls.h | |
| parent | a0c0629dd963b00f989172f0c599353b6b288c37 (diff) | |
| parent | ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa (diff) | |
| download | ffmpeg-f4f7888bab7061f08c54356c285adaba24383dc0.tar.gz | |
Merge commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa'
* commit 'ffe04c330335add4c6d70ab0bb98e6b3f4f7abfa':
libxvid: use the AVFrame API properly.
pcxenc: use the AVFrame API properly.
roqvideo: remove unused variables
libschroedingerenc: use the AVFrame API properly.
Conflicts:
libavcodec/pcxenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpegls.h')
0 files changed, 0 insertions, 0 deletions