diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 11:52:28 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-14 11:52:28 +0100 |
| commit | 0c402810faf64ea3b62601e94d3dcb0cbbdcee5e (patch) | |
| tree | 02b0eead294f11c01ca34e18905cefb0819dc4e5 /libavresample/avresample-test.c | |
| parent | dded5ed9c5eb0c3d5a953e661ea21a9019e93ea4 (diff) | |
| parent | 2e708f17083fc41f10161f2406d57ec154c75468 (diff) | |
| download | ffmpeg-0c402810faf64ea3b62601e94d3dcb0cbbdcee5e.tar.gz | |
Merge commit '2e708f17083fc41f10161f2406d57ec154c75468'
* commit '2e708f17083fc41f10161f2406d57ec154c75468':
ljpeg: fix duplicated pixel format entry
Conflicts:
libavcodec/ljpegenc.c
No change as there was no duplicate entry in ffmpeg
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/avresample-test.c')
0 files changed, 0 insertions, 0 deletions