FFmpeg/libavcodec
Michael Niedermayer 64a0ed190e Merge commit '13207484bba8a8b78b40d5a22da8c9c555429089'
* commit '13207484bba8a8b78b40d5a22da8c9c555429089':
  mpeg4video_parser: stop using deprecated avcodec_set_dimensions
  mpeg12dec: stop using deprecated avcodec_set_dimensions
  mjpegdec: stop using deprecated avcodec_set_dimensions
  libvpxdec: stop using deprecated avcodec_set_dimensions

Conflicts:
	libavcodec/mjpegdec.c
	libavcodec/mpeg12dec.c
	libavcodec/mpeg4video_parser.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-11-01 15:14:52 +01:00
..
2013-10-23 14:32:04 +02:00
2013-10-30 11:04:06 +00:00
2013-10-28 08:33:21 -04:00
2013-10-30 11:04:06 +00:00
2013-10-03 23:00:09 +02:00
2013-10-30 23:56:52 +01:00
2013-10-15 17:00:28 +01:00
2013-10-06 20:12:37 +00:00
2013-10-08 12:40:33 +00:00
2013-10-15 23:58:20 +02:00
2013-10-18 16:46:08 +02:00
2013-11-01 12:59:40 +01:00
2013-10-27 23:49:50 +01:00
2013-10-27 23:49:50 +01:00
2013-10-28 10:37:11 +01:00
2013-10-31 20:17:18 +01:00
2013-10-15 22:13:02 +02:00
2013-10-15 22:13:02 +02:00
2013-10-15 22:13:02 +02:00
2013-10-13 21:48:28 +02:00
2013-10-28 23:54:28 +01:00
2013-10-30 12:41:43 +00:00
2013-10-29 18:36:21 +01:00
2013-10-23 10:49:48 +02:00
2013-10-22 19:55:47 +02:00
2013-10-28 23:54:28 +01:00
2013-10-22 19:55:47 +02:00
2013-10-27 13:34:35 +01:00
2013-10-02 21:03:11 -04:00
2013-10-30 11:04:06 +00:00