[FFmpeg-cvslog] Merge remote-tracking branch 'rdp/combined2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 20:14:09 2013 +0100| [474519433634c05a86270f342b3417cbcd9712c3] | committer: Michael Niedermayer

Merge remote-tracking branch 'rdp/combined2'

* rdp/combined2:
  dshow: allow for more codec ID's
  dshow: better error reporting
  dshow: fix log message

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

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