-
Michael Niedermayer authored
* commit 'd509ae5b': jvdec: K&R formatting cosmetics Conflicts: libavcodec/jvdec.c libavformat/jvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
dcbc748a
* commit 'd509ae5b': jvdec: K&R formatting cosmetics Conflicts: libavcodec/jvdec.c libavformat/jvdec.c Merged-by: Michael Niedermayer <michaelni@gmx.at>