virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-04-02 20:35:37 +02:00
Code Issues Releases Activity

Merge commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08'

Browse Source 
* commit 'dc4b2e7d33903a6b9380e8a84b22b3a20facbb08':
  rv34: use ff_mpeg_update_thread_context only when decoder is fully initialized

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-22 18:49:22 +02:00
commit e356f6c55d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/rv34.c
View File

@ -1569,16 +1569,18 @@ int ff_rv34_decode_update_thread_context(AVCodecContext *dst, const AVCodecConte
return err; return err;
} }
if ((err = ff_mpeg_update_thread_context(dst, src)))
return err;
r->cur_pts = r1->cur_pts; r->cur_pts = r1->cur_pts;
r->last_pts = r1->last_pts; r->last_pts = r1->last_pts;
r->next_pts = r1->next_pts; r->next_pts = r1->next_pts;
memset(&r->si, 0, sizeof(r->si)); memset(&r->si, 0, sizeof(r->si));
return 0; // Do no call ff_mpeg_update_thread_context on a partially initialized
// decoder context.
if (!s1->linesize)
return 0;
return ff_mpeg_update_thread_context(dst, src);
} }
static int get_slice_offset(AVCodecContext *avctx, const uint8_t *buf, int n) static int get_slice_offset(AVCodecContext *avctx, const uint8_t *buf, int n)