[FFmpeg-cvslog] Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug  1 14:33:16 2014 +0200| [713dbe0655e4c3a906b0d812a6f90ac161223876] | committer: Michael Niedermayer

Merge commit '706208ef47bffd525c982975d2756f7b2b220b8d'

* commit '706208ef47bffd525c982975d2756f7b2b220b8d':
  fate: Split fate-pixdesc tests and dispatch them through Make

Conflicts:
	tests/fate-run.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=713dbe0655e4c3a906b0d812a6f90ac161223876
---