[FFmpeg-cvslog] Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Aug 22 18:49:22 2014 +0200| [e356f6c55d46bf3e58005c4e55b2226834a2c22a] | committer: Michael Niedermayer

Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'

* commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08':
  rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized

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

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