Merge commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 10:07:07 +0000 (11:07 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Mar 2013 10:07:48 +0000 (11:07 +0100)
commit7609d42d0f4682ccccbebe0c70613af189134a33
tree1b16e91e2d40d31041e3a02ae355790d3ec76768
parent021547bfcc90cbcbc7f81753279ea929da0c8fc8
parent757d85868b77c4fdec7b77a3b7de1faf16c031e8
Merge commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8'

* commit '757d85868b77c4fdec7b77a3b7de1faf16c031e8':
  vdpau: fix obsolete mpeg1 vdpau decoder when mpeg2 is disabled

Conflicts:
libavcodec/mpeg12.c

Nothing changes as the buggy code is not in ffmpeg

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