[FFmpeg-cvslog] Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 01:29:19 2014 +0200| [9f028b3f3af549a95b4a50af6a1d02acc5089a9f] | committer: Michael Niedermayer

Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'

* commit '49106844929b7b71ac719064d640f8aa56c89b1f':
  tiffenc: fix packet size calculation

Conflicts:
	libavcodec/tiffenc.c

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

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