ffmpeg/libavutil
Michael Niedermayer 945c7e399a Merge commit '38e15df1489d86c016515223ee693e7d0326c56a'
* commit '38e15df1489d86c016515223ee693e7d0326c56a':
  avframe: note that linesize is not the usable data size

Conflicts:
	libavutil/frame.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-09-28 10:47:43 +02:00
..
2012-10-28 14:33:41 +01:00
2012-10-28 14:33:41 +01:00
2012-12-05 20:25:32 +01:00
2013-09-21 15:36:33 +02:00
2013-07-10 12:07:53 +00:00
2013-07-10 12:07:53 +00:00
2013-04-13 23:48:26 +02:00
2013-01-24 00:49:47 +01:00
2013-06-16 12:49:39 +02:00
2013-06-15 18:49:12 -03:00
2013-06-12 01:47:42 +02:00
2012-08-09 01:44:15 +02:00
2013-08-10 18:17:30 +02:00
2013-06-15 02:22:39 +02:00
2013-05-15 12:10:09 +02:00
2013-05-13 21:42:37 +02:00
2013-08-12 19:40:29 +02:00
2013-04-15 20:31:06 +02:00
2013-09-24 14:02:10 +02:00
2013-06-15 18:54:01 -03:00
2013-06-02 11:27:19 +02:00
2012-10-28 14:33:41 +01:00
2013-06-13 14:57:00 +02:00
2013-08-01 11:29:12 +02:00