FFmpeg/libavcodec
Michael Niedermayer f57a7ac9b8 Merge commit '8aa3500905fec6c4e657bb291b861d43c34d3de9'
* commit '8aa3500905fec6c4e657bb291b861d43c34d3de9':
  mjpeg: Validate sampling factors

Conflicts:
	libavcodec/mjpegdec.c

See: 08c37a10e9ef7e30d7b7a889ad28c7fa9c49c886

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-05-21 10:50:03 +02:00
..
2013-05-10 16:53:50 -03:00
2013-05-10 16:10:51 -03:00
2013-05-18 07:12:56 +02:00
2013-05-13 14:39:32 +02:00
2013-04-25 20:06:13 +00:00
2013-05-18 07:12:56 +02:00
2013-04-25 14:21:00 +00:00
2013-05-04 14:42:19 +02:00
2013-05-15 12:15:21 +02:00
2013-05-07 20:33:46 +02:00
2013-05-04 02:50:30 +02:00
2013-05-11 21:23:46 +02:00
2013-05-19 13:56:13 +02:00
2013-05-16 14:05:46 +02:00
2013-04-30 13:35:14 +02:00
2013-05-06 01:58:10 +02:00
2013-05-06 16:38:03 +02:00
2013-05-18 07:12:56 +02:00
2013-05-10 01:40:24 +02:00
2013-05-07 21:59:05 +02:00
2013-05-07 20:05:53 +02:00
2013-05-20 21:45:40 +02:00
2013-05-17 15:11:47 +02:00
2013-05-05 15:12:59 +02:00
2013-04-25 20:17:05 +00:00