[FFmpeg-cvslog] Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Jun  8 11:41:58 2013 +0200| [dc318505d010c600f58ab67224940b3dacf97bcd] | committer: Michael Niedermayer

Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'

* commit '999ccd2d0a43640921088578f138c874f6cc0f8a':
  tiff: cleanup the error paths

Conflicts:
	libavcodec/tiff.c

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

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