OSDN Git Service

Merge branch 'master' of https://github.com/upsuper/ffmpeg-vdadec
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Dec 2013 02:00:38 +0000 (03:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 29 Dec 2013 02:16:09 +0000 (03:16 +0100)
* 'master' of https://github.com/upsuper/ffmpeg-vdadec:
  avcodec/vda_h264_dec: add format check

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

Trivial merge