Merge commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445'

* commit 'df507d5aa063c2ce31fac9f76c6f3bbe9a20c445':
  tiff: Replace deprecated PIX_FMT names by modern ones

Conflicts:
	libavcodec/tiff.c

See: ac627b3d38
Merged-by: Michael Niedermayer <michaelni@gmx.at>
pull/80/head
Michael Niedermayer 11 years ago
commit 149c1a26c4

Diff Content Not Available