Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 16:49:22 +0000 (18:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 22 Aug 2014 16:49:52 +0000 (18:49 +0200)
commite356f6c55d46bf3e58005c4e55b2226834a2c22a
tree04cd1451153b1dc9904e4346f196cc319fff3586
parentde9e0386b2f01852e305faae62736f387cf5a18a
parentdc4b2e7d33903a6b9380e8a84b22b3a20facbb08
Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/rv34.c