Merge remote-tracking branch 'qatar/release/9' into release/1.1
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Jun 2013 09:06:28 +0000 (11:06 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 9 Jun 2013 09:06:28 +0000 (11:06 +0200)
commit01580c0955f9fba6a1a04b85eaa2f2ec5e234bf6
tree53a3afc35b316c74018be1781ae82983dc6a7a28
parent2fae70db2ac2ffaf7968637fe4f111a24e7e4351
parent8eb7c2566ca20392315618cda4a635b19cbb8e21
Merge remote-tracking branch 'qatar/release/9' into release/1.1

* qatar/release/9:
  tiff: do not overread the source buffer
  apetag: use int64_t for filesize

Conflicts:
libavcodec/tiff.c

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