Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 09:31:31 +0000 (11:31 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 09:32:34 +0000 (11:32 +0200)
commit1fec361f353cf140a67b28c2d73c3822a89a76d6
tree973bccb6cd7feab4fe92d22856fbdb522e214e8e
parenta804632b155d7e4841ee568cadb05d4f7e5d4af9
parent016c5b066de08a93a5f6b5beb0ef377356b35cde
Merge commit '016c5b066de08a93a5f6b5beb0ef377356b35cde'

* commit '016c5b066de08a93a5f6b5beb0ef377356b35cde':
  tiff: refactor fax support in a separate function

Conflicts:
libavcodec/tiff.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/tiff.c