diff options
author | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 02:33:37 +0100 |
---|---|---|
committer | Michael Niedermayer <michaelni@gmx.at> | 2013-02-01 02:33:42 +0100 |
commit | ffd02d0c197449052488b6867280dedd5425e94a (patch) | |
tree | ec9da069ef2d5b1ee2a30d6627fa8eeec6abdc15 /libavformat/lmlm4.c | |
parent | 4789c25d83c4a90e8ef81d2cc05be6d2f12dfa68 (diff) | |
parent | 28f36dce3e5c6be6b7f208362fca3531ed3cb50d (diff) | |
download | ffmpeg-streaming-ffd02d0c197449052488b6867280dedd5425e94a.zip ffmpeg-streaming-ffd02d0c197449052488b6867280dedd5425e94a.tar.gz |
Merge remote-tracking branch 'mjbshaw/master'
* mjbshaw/master:
libopenjpegenc: simplify switch statement
libopenjpegenc: add support for pix fmt gbrp (8-16 bit)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/lmlm4.c')
0 files changed, 0 insertions, 0 deletions