Merge commit '741b352b16dad74b87c4a39bade8902633a2b0e6'
authorHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:53:42 +0000 (13:53 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Tue, 29 Sep 2015 11:53:42 +0000 (13:53 +0200)
commit4554178f072ea1fad054381ba5ce3b48b5cf9280
tree3588b834122f84abfabbe712a5141d169f907ab6
parentc36e85b3d9a13a223a621e7c322ce5903080cc4b
parent741b352b16dad74b87c4a39bade8902633a2b0e6
Merge commit '741b352b16dad74b87c4a39bade8902633a2b0e6'

* commit '741b352b16dad74b87c4a39bade8902633a2b0e6':
  qsvdec: list supported pixel formats

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavcodec/qsvdec_h2645.c
libavcodec/qsvdec_mpeg2.c
libavcodec/qsvdec_vc1.c