OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
68a9194
)
ffv1: move clear_state() to clear_slice_state() in encoding threads
author
Michael Niedermayer
<michaelni@gmx.at>
Wed, 25 Apr 2012 16:02:43 +0000
(18:02 +0200)
committer
Michael Niedermayer
<michaelni@gmx.at>
Wed, 25 Apr 2012 16:05:29 +0000
(18:05 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/ffv1.c
patch
|
blob
|
history
diff --git
a/libavcodec/ffv1.c
b/libavcodec/ffv1.c
index
e03778e
..
4df005f
100644
(file)
--- a/
libavcodec/ffv1.c
+++ b/
libavcodec/ffv1.c
@@
-1196,6
+1196,8
@@
static int encode_slice(AVCodecContext *c, void *arg){
AVFrame * const p= &f->picture;
const int ps= (f->bits_per_raw_sample>8)+1;
+ if(p->key_frame)
+ clear_slice_state(f, fs);
if(f->version > 2){
encode_slice_header(f, fs);
}
@@
-1252,7
+1254,6
@@
static int encode_frame(AVCodecContext *avctx, AVPacket *pkt,
p->key_frame= 1;
f->gob_count++;
write_header(f);
- clear_state(f);
}else{
put_rac(c, &keystate, 0);
p->key_frame= 0;