[FFmpeg-cvslog] Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Nov 21 19:09:12 2013 +0100| [c0caf7e81493f5d9d4acd013892b651ab39be450] | committer: Michael Niedermayer

Merge commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1'

* commit 'dd249245d012c1eceb57c166e256fc95e74f4bb1':
  filter docs: reference scale and fps filters

Conflicts:
	doc/filters.texi

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

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