diff options
| author | jstebbins <[email protected]> | 2010-10-02 19:11:09 +0000 |
|---|---|---|
| committer | jstebbins <[email protected]> | 2010-10-02 19:11:09 +0000 |
| commit | 2234c261324989a56bb7401088e45384578b91d2 (patch) | |
| tree | af4d132f918504d306f0308c4abc73f42051ede5 /libhb/stream.c | |
| parent | ce5592b18dfe78c3e46a2816b541ad9a1d0c429e (diff) | |
fix ffmpeg locking issue
ffmpeg complained "insufficient thread locking around avcodec_open/close()".
This was caused by encavcodec.c calling avcodec_open at the same time as
stream.c called av_find_stream_info. av_find_stream_info has a side effect
of calling avcodec_open, so we must lock around this call as well.
git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3563 b64f7644-9d1e-0410-96f1-a4d463321fa5
Diffstat (limited to 'libhb/stream.c')
| -rw-r--r-- | libhb/stream.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libhb/stream.c b/libhb/stream.c index 85a891c7b..f37985424 100644 --- a/libhb/stream.c +++ b/libhb/stream.c @@ -2909,7 +2909,7 @@ static int ffmpeg_open( hb_stream_t *stream, hb_title_t *title ) { return 0; } - if ( av_find_stream_info( ic ) < 0 ) + if ( hb_av_find_stream_info( ic ) < 0 ) goto fail; stream->ffmpeg_ic = ic; |