FFmpeg/libavcodec
Michael Niedermayer e40cdf8604 Merge commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf'
* commit '2a06c2a03e1205aaeede5af850b9271752ddd4cf':
  mpegvideo_enc: Draw edges on input for non-multiple of 16 resolutions

Conflicts:
	libavcodec/mpegvideo_enc.c

See: 1e78679768b3a1ef336c5b52aa5027d8a50fcf0d
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-23 22:03:21 +01:00
..
2015-01-07 19:46:16 +01:00
2015-01-11 22:19:48 +01:00
2015-01-09 20:33:53 +01:00
2015-01-05 01:45:49 +01:00
2015-01-11 22:19:48 +01:00
2015-01-17 13:01:26 +01:00
2015-01-15 01:25:16 +01:00
2015-01-22 01:47:54 +01:00
2015-01-22 01:33:05 +01:00
2015-01-22 01:49:04 +01:00
2015-01-22 01:49:04 +01:00
2015-01-13 17:27:45 +01:00
2015-01-11 12:15:03 +01:00
2015-01-05 01:45:49 +01:00
2015-01-20 01:16:25 +01:00
2015-01-18 00:34:19 +01:00
2015-01-19 17:12:09 +01:00