Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 11:22:51 +0000 (12:22 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 24 Feb 2013 11:22:51 +0000 (12:22 +0100)
commit4ba35194a9d79b80a606aafe8744d82de5b4bcf4
treede96700a80c207195a640fd4f7a60e4aafcdc60e
parentccc7bcc4fcaab51abfc618a8d74fb1e7f07005f1
parentf935aca44c674d30e3ed940ef73bbad1228a5855
Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'

* commit 'f935aca44c674d30e3ed940ef73bbad1228a5855':
  av_memcpy_backptr: avoid an infinite loop for back = 0
  4xm: check the return value of read_huffman_tables().

Conflicts:
libavcodec/4xm.c
libavutil/mem.c

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