[FFmpeg-cvslog] Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Oct 17 14:57:00 2014 +0200| [1eda312aca278c81fea9f0f67413b3ee9f386b4a] | committer: Michael Niedermayer

Merge commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4'

* commit '47e3e1097e09da7f973908e09df15e3bb7c5e1f4':
  cmdutils: Use the correct guard

Conflicts:
	cmdutils.c

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

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