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)
* commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08':
  rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized

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

Simple merge