Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 09:41:58 +0000 (11:41 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 09:41:58 +0000 (11:41 +0200)
commitdc318505d010c600f58ab67224940b3dacf97bcd
tree63842583739b1058f45bba2a6a14e0bea5d961da
parent1fec361f353cf140a67b28c2d73c3822a89a76d6
parent999ccd2d0a43640921088578f138c874f6cc0f8a
Merge commit '999ccd2d0a43640921088578f138c874f6cc0f8a'

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

Conflicts:
libavcodec/tiff.c

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