ffmpeg/libavfilter
Michael Niedermayer de5ec08825 Merge commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8'
* commit '862f33c10ea38ea49fa4188725df5e5246dbd1d8':
  vf_scale: use the pixfmt descriptor API

Conflicts:
	libavfilter/vf_scale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-27 02:54:58 +02:00
..
2014-02-26 16:37:59 +00:00
2014-02-26 16:37:59 +00:00
2014-01-19 17:12:40 +01:00
2014-02-26 16:37:59 +00:00
2014-05-03 20:08:18 +02:00
2014-01-19 17:12:50 +01:00
2013-09-30 08:47:40 +00:00
2013-09-12 14:01:43 +00:00
2014-05-20 00:00:44 +02:00
2014-04-19 09:56:01 +02:00
2014-02-07 09:33:56 +01:00
2014-03-31 03:22:20 +02:00
2013-06-14 01:27:22 +02:00
2014-01-19 17:13:02 +01:00
2014-04-19 16:20:57 +02:00