[FFmpeg-cvslog] Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Aug  3 19:35:08 2014 +0200| [85aaa4e6d571e44749f80b8223c07d656bf8e035] | committer: Michael Niedermayer

Merge commit '072916d903d3a925bcd0c864f12254157cab63c1'

* commit '072916d903d3a925bcd0c864f12254157cab63c1':
  filtfmts: Replace deprecated uses of AVFilterPad

Conflicts:
	libavfilter/filtfmts.c

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

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