generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit 'e6b1c3bbe7082c71ea8ee8ac83698c156c9e4838'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-01-29 14:19:47 +01:00
commit 3c8085dc42
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/pthread.c
View File

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

1
libavformat/mvi.c
View File

@ -89,6 +89,7 @@ static int read_header(AVFormatContext *s)
ast->codec->bit_rate = ast->codec->sample_rate * 8; ast->codec->bit_rate = ast->codec->sample_rate * 8;
avpriv_set_pts_info(vst, 64, msecs_per_frame, 1000000); 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_type = AVMEDIA_TYPE_VIDEO;
vst->codec->codec_id = AV_CODEC_ID_MOTIONPIXELS; vst->codec->codec_id = AV_CODEC_ID_MOTIONPIXELS;