aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-28 11:07:07 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-28 11:07:48 +0100
commit7609d42d0f4682ccccbebe0c70613af189134a33 (patch)
tree1b16e91e2d40d31041e3a02ae355790d3ec76768
parent021547bfcc90cbcbc7f81753279ea929da0c8fc8 (diff)
parent757d85868b77c4fdec7b77a3b7de1faf16c031e8 (diff)
downloadffmpeg-7609d42d0f4682ccccbebe0c70613af189134a33.tar.gz
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>
0 files changed, 0 insertions, 0 deletions