[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Feb 25 09:02:57 2014 +0100| [a8ad7e47fb59d386e8672e38305cbe94138dabd1] | committer: Michael Niedermayer

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  texi2pod: always declare the pod file as UTF-8 encoded

Conflicts:
	doc/texi2pod.pl

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

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