Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 23:29:19 +0000 (01:29 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 23:29:19 +0000 (01:29 +0200)
commit9f028b3f3af549a95b4a50af6a1d02acc5089a9f
treeabc64a309f89923734a7b2542f6d1bfa535e12d6
parenteb0fc73dcc85268f43fe6978342acf8eb90f72fe
parent49106844929b7b71ac719064d640f8aa56c89b1f
Merge commit '49106844929b7b71ac719064d640f8aa56c89b1f'

* commit '49106844929b7b71ac719064d640f8aa56c89b1f':
  tiffenc: fix packet size calculation

Conflicts:
libavcodec/tiffenc.c

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