Merge commit '12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 16:51:21 +0000 (17:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 4 Nov 2013 16:51:21 +0000 (17:51 +0100)
commit1825d6d096102c2a220d61bad34009f583ca4a5e
tree6fb67810b42eb77e551e378c7c8f9dcc7c0d042c
parenta5115752cad0fdda77ce07ecb0cbc05988a7f7c7
parent12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca
Merge commit '12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca' into release/0.10

* commit '12dc01bb1f07112cd7eb31e183d75cb3c0fb92ca':
  4xm: do not overread the prestream buffer

Conflicts:
libavcodec/4xm.c

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