[FFmpeg-cvslog] Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Dec 29 03:00:38 2013 +0100| [3477874abdd4a892ec3df2a9685ed959e2f73f21] | committer: Michael Niedermayer

Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec

* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
  avcodec/vda_h264_dec: add format check

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

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