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
2013-02-12 12:41:09 +01:00
2013-02-21 22:43:08 +01:00
2013-01-23 14:04:50 +01:00
2013-02-20 12:04:50 +01:00
2013-02-19 22:33:19 +02:00
2012-12-05 20:25:32 +01:00
2013-01-30 16:54:15 +01:00
2013-01-25 14:36:45 +01:00
2012-12-11 02:13:43 +01:00
2013-01-05 15:40:40 +01:00
2013-01-02 23:52:35 +01:00
2012-12-05 13:34:45 +01:00
2013-02-09 18:14:46 +01:00
2012-12-02 18:51:04 +01:00
2013-01-05 12:21:39 +01:00
2012-12-05 13:34:45 +01:00
2013-02-12 13:11:14 +01:00
2012-12-05 13:34:45 +01:00
2013-02-01 03:56:51 +01:00
2013-01-26 13:34:30 +01:00
2013-02-17 17:36:27 +01:00
2012-12-05 13:34:45 +01:00
2012-11-30 14:55:12 +01:00
2013-01-24 00:49:47 +01:00
2013-01-24 00:49:47 +01:00
2013-01-16 12:07:27 +01:00
2013-01-15 15:57:33 +01:00
2013-02-15 12:10:08 +01:00
2013-02-13 15:35:54 +00:00
2013-01-22 16:02:31 +01:00
2012-12-05 13:34:45 +01:00
2012-12-19 14:28:58 +01:00
2013-01-16 12:07:27 +01:00
2013-01-03 00:02:22 +01:00
2013-01-03 00:02:51 +01:00
2012-12-05 13:34:45 +01:00
2013-02-24 12:22:51 +01:00
2012-12-31 11:20:45 +01:00
2012-12-08 01:34:28 +01:00
2013-02-22 23:43:46 +01:00
2013-02-22 23:45:31 +01:00
2013-01-12 13:42:42 +01:00
2013-01-12 13:42:42 +01:00
2012-12-28 14:05:41 +01:00
2012-12-05 13:34:45 +01:00
2013-01-24 21:06:24 +01:00
2013-01-05 16:25:37 +01:00
2013-02-22 23:43:46 +01:00
2012-12-29 03:37:46 +01:00
4ba35194a9