[FFmpeg-cvslog] Merge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  8 12:21:14 2013 +0200| [d0b27eab925cf5fb372840706a009b173418963f] | committer: Michael Niedermayer

Merge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c'

* commit '9c2216976907336dfae0e8e38a4d70ca2465a92c':
  tiff: do not overread the source buffer

Conflicts:
	libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d0b27eab925cf5fb372840706a009b173418963f
---