[FFmpeg-cvslog] Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'
Michael Niedermayer
git at videolan.org
Sun Apr 13 01:56:08 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 13 01:48:43 2014 +0200| [6145b1d9c11bb5261e4b5137ef31defacad56eb5] | committer: Michael Niedermayer
Merge commit 'bf2064f046af64c59a416c814474a39b0a457569'
* commit 'bf2064f046af64c59a416c814474a39b0a457569':
tiffdec: rename variables for consistency and fix variable shadowing
Conflicts:
libavcodec/tiff.c
See: 251345a3fe221d60e9b275567085f9475de68092
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6145b1d9c11bb5261e4b5137ef31defacad56eb5
---
More information about the ffmpeg-cvslog
mailing list