Michael Niedermayer 4ba35194a9 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>

2013-02-24 12:22:51 +01:00

8.4 KiB

Raw Blame History

View Raw