[FFmpeg-cvslog] Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Mar  1 12:47:53 2013 +0100| [46f4b468e2102467aadf5b91e44b8a0607202ee2] | committer: Michael Niedermayer

Merge commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a'

* commit 'cb6f8245aed2c26fe95c30cd68c45983277a945a':
  cmdutils: Allow calling filter_codec_opts without a set encoder
  pnm: Use av_pix_fmt_desc_get instead of accessing the array directly

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

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