aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/vdpau_internal.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-01-16 23:23:09 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-01-16 23:23:09 +0100
commita26bfc444d256585a9c084cc89ac0f983241755a (patch)
treec0f251fbef5fb29db2aaaa182f5ca24c1f71890c /libavcodec/vdpau_internal.h
parent93e3ec451caf12ebb22fbf3ecdb7bba41f7835c6 (diff)
parent48d57650f121d3d9e977832e9006bb334337d921 (diff)
downloadffmpeg-a26bfc444d256585a9c084cc89ac0f983241755a.tar.gz
Merge commit '48d57650f121d3d9e977832e9006bb334337d921' into release/0.10
* commit '48d57650f121d3d9e977832e9006bb334337d921': pthread: Fix deadlock during thread initialization mpegvideo: Initialize chroma_*_shift and codec_tag even if the size is 0 vc1dec: Don't decode slices when the latest slice header failed to decode Conflicts: libavcodec/mpegvideo.c libavcodec/pthread.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vdpau_internal.h')
0 files changed, 0 insertions, 0 deletions