diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-12-19 17:30:41 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2008-12-19 17:30:41 +0000 |
| commit | e8d99698c23b1d8ac4a396635e9af60d52a12229 (patch) | |
| tree | 00572f714497b467d5eb96524b1c8ada552b5734 /src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | |
| parent | 5f99afc31569637ac29935b2073e943ac1c2414b (diff) | |
| download | qmmp-e8d99698c23b1d8ac4a396635e9af60d52a12229.tar.gz qmmp-e8d99698c23b1d8ac4a396635e9af60d52a12229.tar.bz2 qmmp-e8d99698c23b1d8ac4a396635e9af60d52a12229.zip | |
more ffmpeg formats support (including ape); ffmpeg plugin settings
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@692 90c681e8-e032-0410-971d-27865f9a5e38
Diffstat (limited to 'src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp')
| -rw-r--r-- | src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp index c1b5ac2e2..49c13da9f 100644 --- a/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp +++ b/src/plugins/Input/ffmpeg/decoder_ffmpeg.cpp @@ -87,9 +87,7 @@ void DecoderFFmpeg::flush(bool final) while ((! done && ! m_finish) && output()->recycler()->full()) { mutex()->unlock(); - output()->recycler()->cond()->wait(output()->recycler()->mutex()); - mutex()->lock (); done = user_stop; } @@ -193,18 +191,15 @@ void DecoderFFmpeg::deinit() void DecoderFFmpeg::run() { -// mpc_uint32_t vbrAcc = 0; -// mpc_uint32_t vbrUpd = 0; uint8_t *inbuf_ptr; int out_size, size; AVPacket pkt; mutex()->lock (); - if (! inited) + if (!inited) { mutex()->unlock(); - return; } mutex()->unlock(); |
