[FFmpeg-cvslog] Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 16 15:21:31 2013 +0200| [e55092b12b572e53b3970ca261e9205ae4cabcb0] | committer: Michael Niedermayer

Merge commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8'

* commit 'f6b6d6ac42c0ee427fcd3fae4c398b2103b491b8':
  vf_frei0r: use the name 's' for the pointer to the private context
  vf_format: use the name 's' for the pointer to the private context
  vf_fieldorder: use the name 's' for the pointer to the private context
  vf_fieldorder: cosmetics, remove an extra linebreak

Conflicts:
	libavfilter/vf_frei0r.c

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

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