diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-30 02:24:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-30 02:34:35 +0100 |
| commit | c40a35f8a7e3977c18d0ebff503a3add8ff58dad (patch) | |
| tree | 889e78f2d463e5c5919533e818d781fb4fb744dc /libavcodec | |
| parent | 23b4f355bbd9b8c5338fc4e31b39657073e1f88f (diff) | |
| parent | 464ccb01447b91717cf580b870e636514701ce4f (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
indeo3: check per-plane data buffer against input buffer bounds.
avconv: Handle audio sync for non-S16 sample formats.
pthread: don't increment index on zero-sized packets.
Conflicts:
libavcodec/indeo3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/pthread.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/pthread.c b/libavcodec/pthread.c index 4d64338eba..8aac89fa24 100644 --- a/libavcodec/pthread.c +++ b/libavcodec/pthread.c @@ -494,6 +494,7 @@ static int submit_packet(PerThreadContext *p, AVPacket *avpkt) } fctx->prev_thread = p; + fctx->next_decoding++; return 0; } @@ -516,8 +517,6 @@ int ff_thread_decode_frame(AVCodecContext *avctx, err = submit_packet(p, avpkt); if (err) return err; - fctx->next_decoding++; - /* * If we're still receiving the initial packets, don't return a frame. */ |