FFmpeg/libavcodec
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
..
2014-11-08 23:32:39 +01:00
2014-10-22 23:12:38 +02:00
2014-10-22 23:12:38 +02:00
2014-10-22 23:12:38 +02:00
2014-10-24 09:53:42 +03:00
2014-10-15 16:08:36 +02:00
2014-11-13 01:41:26 +01:00
2014-10-28 12:22:03 +01:00
2014-10-28 12:22:03 +01:00
2014-10-28 12:48:58 +01:00
2014-10-28 15:30:05 +01:00
2014-10-24 09:53:42 +03:00
2014-11-03 10:15:07 -05:00
2014-11-13 01:41:25 +01:00
2014-10-27 20:55:57 +01:00
2014-10-18 19:41:48 +02:00
2014-10-22 23:12:38 +02:00
2014-10-15 16:08:36 +02:00
2014-10-18 20:06:29 +02:00