diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:19:47 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-29 14:19:56 +0100 |
| commit | 3c8085dc4250a98405eb64b3765f4ceb8d177c00 (patch) | |
| tree | 69b6249cb0ee3476243f87e8b9125788cf10752a | |
| parent | 31d8d61f590ef6ebc22607d891158fc418c796a7 (diff) | |
| parent | e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838 (diff) | |
Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'
* commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838':
pthread: make ff_thread_release_buffer idempotent.
mvi: set framerate
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/pthread.c | 3 | ||||
| -rw-r--r-- | libavformat/mvi.c | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 2bd8df8e0a..1ca72b44f2 100644 --- a/libavcodec/pthread.c +++ b/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; diff --git a/libavformat/mvi.c b/libavformat/mvi.c index 9184927a2f..6b74597f07 100644 --- a/libavformat/mvi.c +++ b/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; |