[FFmpeg-cvslog] Merge commit '48d57650f121d3d9e977832e9006bb334337d921' into release/0.10

[Michael Niedermayer]

ffmpeg | branch: release/0.10 | Michael Niedermayer <michaelni at gmx.at> | Thu Jan 16 23:23:09 2014 +0100| [a26bfc444d256585a9c084cc89ac0f983241755a] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a26bfc444d256585a9c084cc89ac0f983241755a
---