[FFmpeg-cvslog] ffv1: split clear_slice_state() out so individual slices can be cleared.
Michael Niedermayer
git at videolan.org
Fri Apr 20 15:43:15 CEST 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Apr 20 14:51:42 2012 +0200| [c7a435aab2637b9f48930f998b7f9f3d776a44ac] | committer: Michael Niedermayer
ffv1: split clear_slice_state() out so individual slices can be cleared.
This allows us to clear outside of the main thread for example.
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=c7a435aab2637b9f48930f998b7f9f3d776a44ac
---
libavcodec/ffv1.c | 14 ++++++++++----
1 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c
index 2bad0f2..df3949c 100644
--- a/libavcodec/ffv1.c
+++ b/libavcodec/ffv1.c
@@ -1118,11 +1118,9 @@ static av_cold int encode_init(AVCodecContext *avctx)
#endif /* CONFIG_FFV1_ENCODER */
-static void clear_state(FFV1Context *f){
- int i, si, j;
+static void clear_slice_state(FFV1Context *f, FFV1Context *fs){
+ int i, j;
- for(si=0; si<f->slice_count; si++){
- FFV1Context *fs= f->slice_context[si];
for(i=0; i<f->plane_count; i++){
PlaneContext *p= &fs->plane[i];
@@ -1143,6 +1141,14 @@ static void clear_state(FFV1Context *f){
}
}
}
+}
+
+static void clear_state(FFV1Context *f){
+ int si;
+
+ for(si=0; si<f->slice_count; si++){
+ FFV1Context *fs= f->slice_context[si];
+ clear_slice_state(f, fs);
}
}
More information about the ffmpeg-cvslog
mailing list