Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:28:57 +0000 (13:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:28:57 +0000 (13:28 +0100)
commitd2e0543766e0c8c077ab51495991f47066d9e768
tree780ee902be56fe81c8d479f2993f68f33ee04056
parent1db2d39dfddacb50546c9cdc1071f42146b23fa6
parent0562887a984388fdc7a9b71c9374ff9c756fb4f1
Merge commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1'

* commit '0562887a984388fdc7a9b71c9374ff9c756fb4f1':
  tiffenc: initialize return value

Conflicts:
libavcodec/tiffenc.c

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