Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:24:22 +0000 (13:24 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 6 Aug 2013 11:24:22 +0000 (13:24 +0200)
commitbf36dc50ea448999c8f8c7a35f6139a7040f6275
treec6680553d1ea71baf7408233b6eec6ab92d75b8a
parentb7fc2693c70fe72936e4ce124c802ac23857c476
parent578ea75a9e4ac56e0bbbbe668700be756aa699f8
Merge commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8'

* commit '578ea75a9e4ac56e0bbbbe668700be756aa699f8':
  vdpau: remove old-style decoders

Conflicts:
libavcodec/allcodecs.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/vc1dec.c
libavcodec/vdpau.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
configure
libavcodec/allcodecs.c
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpeg12.c
libavcodec/mpeg12dec.c
libavcodec/mpeg4videodec.c
libavcodec/mpegvideo.c
libavcodec/svq3.c
libavcodec/vc1dec.c
libavcodec/vdpau.c
libavcodec/vdpau_internal.h