breeze/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2026-02-04 14:30:55 +08:00
Code Issues Packages Projects Releases Wiki Activity
Files
00f3bb2ef2bb25fc41b7a905376f00d104f70185
FFmpeg/libavcodec/jpeg2000.c
Michael Niedermayer 7a79c055e3 Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a' 
* commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a':
  jpeg2000: do not compute the same value twice

Conflicts:
	libavcodec/jpeg2000.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-13 15:20:40 +01:00

22 KiB
Raw Blame History

View Raw
Reference in New Issue View Git Blame Copy Permalink