[FFmpeg-cvslog] Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Apr 28 12:45:31 2013 +0200| [191430a28f6aba118471c2704e66b2abd1638b94] | committer: Michael Niedermayer

Merge commit '28663511c99b3cdaf9387a15032259879474f5f4'

* commit '28663511c99b3cdaf9387a15032259879474f5f4':
  fate: Invoke pixdesc lavfi tests through fate-run.sh

Conflicts:
	tests/fate/avfilter.mak
	tests/lavfi-regression.sh
	tests/ref/fate/filter-pixdesc

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=191430a28f6aba118471c2704e66b2abd1638b94
---