Merge commit 'e6b1c3bb'

* commit 'e6b1c3bb':
  pthread: make ff_thread_release_buffer idempotent.
  mvi: set framerate
Merged-by: Michael Niedermayer <michaelni@gmx.at>

libavcodec/pthread.c

@@ -1023,6 +1023,9 @@ void ff_thread_release_buffer(AVCodecContext *avctx, AVFrame *f)
     PerThreadContext *p = avctx->thread_opaque;
     FrameThreadContext *fctx;
 
+    if (!f->data[0])
+        return;
+
     if (!(avctx->active_thread_type&FF_THREAD_FRAME)) {
         avctx->release_buffer(avctx, f);
         return;

libavformat/mvi.c

@@ -89,6 +89,7 @@ static int read_header(AVFormatContext *s)
     ast->codec->bit_rate        = ast->codec->sample_rate * 8;
 
     avpriv_set_pts_info(vst, 64, msecs_per_frame, 1000000);
+    vst->avg_frame_rate    = av_inv_q(vst->time_base);
     vst->codec->codec_type = AVMEDIA_TYPE_VIDEO;
     vst->codec->codec_id   = AV_CODEC_ID_MOTIONPIXELS;