Merge commit '48d57650f121d3d9e977832e9006bb334337d921' into release/0.10
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 22:23:09 +0000 (23:23 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 16 Jan 2014 22:23:09 +0000 (23:23 +0100)
* 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>
1  2 
libavcodec/vc1dec.c

Simple merge