aboutsummaryrefslogtreecommitdiffstats
path: root/ffmpeg.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-03-29 04:54:57 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-03-29 04:55:58 +0200
commitaebce0b0fa40c7ce7ac31eabe1d16c72c6d4a035 (patch)
tree9e14bfbaf6c3d70ee6f0de253507f191ff78ac5d /ffmpeg.c
parent9aeacc95461750c2161ef4fecbbb3323bcd340fb (diff)
parentb678dd9690662c8041df90f4d0873927abf31372 (diff)
downloadffmpeg-aebce0b0fa40c7ce7ac31eabe1d16c72c6d4a035.tar.gz
Merge git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder
* git://github.com/mjbshaw/FFmpeg-OpenJPEG-J2K-Encoder: Fixes ticket 1127. I'm still looking into why bpp is getting set to 0. Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg.c')
0 files changed, 0 insertions, 0 deletions