Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:00:54 +0000 (02:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 01:00:54 +0000 (02:00 +0100)
commit49f477071dcda8bc956b30020808d05c005577e0
tree2657449383379dc560785900a71dc47c86b69f74
parent5b965a508ca3a5a3002d8d2449e03f4f6e5d7689
parentb82170336f90d06c645d8252ddeccfc92c2f9ccb
Merge commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb' into release/2.4

* commit 'b82170336f90d06c645d8252ddeccfc92c2f9ccb':
  tiffenc: initialize return value

Conflicts:
libavcodec/tiffenc.c

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