ffmpeg | branch: master | Michael Niedermayer <[email protected]> | Thu Nov 13
15:20:40 2014 +0100| [7a79c055e378d1a079d439c3e99fa45289d4a68e] | committer:
Michael Niedermayer
Merge commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a'
* commit 'a2448cfe167a4cd4eb631318550d4eef38fca24a':
jpeg2000: do not compute the same value twice
Conflicts:
libavcodec/jpeg2000.c
Merged-by: Michael Niedermayer <[email protected]>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7a79c055e378d1a079d439c3e99fa45289d4a68e
---
_______________________________________________
ffmpeg-cvslog mailing list
[email protected]
http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
