[FFmpeg-cvslog] Merge commit 'f935aca44c674d30e3ed940ef73bbad1228a5855'

Michael Niedermayer git at videolan.org
Sun Feb 24 12:27:55 CET 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Feb 24 12:22:51 2013 +0100| [4ba35194a9d79b80a606aafe8744d82de5b4bcf4] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4ba35194a9d79b80a606aafe8744d82de5b4bcf4
---





More information about the ffmpeg-cvslog mailing list