Merge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 10:21:14 +0000 (12:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 8 Jun 2013 10:21:14 +0000 (12:21 +0200)
commitd0b27eab925cf5fb372840706a009b173418963f
tree59ee75837a3a31532d682dd563852c62c1584413
parentdc318505d010c600f58ab67224940b3dacf97bcd
parent9c2216976907336dfae0e8e38a4d70ca2465a92c
Merge commit '9c2216976907336dfae0e8e38a4d70ca2465a92c'

* commit '9c2216976907336dfae0e8e38a4d70ca2465a92c':
  tiff: do not overread the source buffer

Conflicts:
libavcodec/tiff.c

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