Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'

* commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
  pthread: make ff_thread_release_buffer idempotent.
  mvi: set framerate

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

diff --cc libavcodec/pthread.c
Simple merge

diff --cc libavformat/mvi.c
Simple merge