[FFmpeg-cvslog] Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 22:47:31 2012 +0100| [61bc3d80e9d819a08111476d9301445aec7d9fff] | committer: Michael Niedermayer

Merge commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a'

* commit '0ec1642b60a5b1a4d913e2b9e3899173dff77e7a':
  cmdutils: don't log an error in opt_default().

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

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