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

Merge remote-tracking branch 'qatar/master'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2011-11-30 02:24:15 +01:00
parent 23b4f355bb 464ccb0144
commit c40a35f8a7
3 changed files with 33 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/pthread.c
View File

@@ -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.
*/