summaryrefslogtreecommitdiff
path: root/libavcodec/ffv1.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-10-21 14:35:47 +0200
committerMichael Niedermayer <michaelni@gmx.at>2012-10-21 14:37:15 +0200
commit69fd0b7adbd22f24d45b6edb10eaf37d18c66bee (patch)
tree9ed4b452f0f2668e0319825e1c341a6c4e7b7bfb /libavcodec/ffv1.h
parente4255eaf47373c0c1691cbcbc0816253e938b662 (diff)
parent71f7b22dba60524b2285643ae0b49d8f64977129 (diff)
downloadffmpeg-69fd0b7adbd22f24d45b6edb10eaf37d18c66bee.tar.gz
Merge commit '71f7b22dba60524b2285643ae0b49d8f64977129'
* commit '71f7b22dba60524b2285643ae0b49d8f64977129': ffv1: split decoder and encoder Conflicts: libavcodec/Makefile libavcodec/ffv1.c libavcodec/ffv1.h libavcodec/ffv1dec.c libavcodec/ffv1enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ffv1.h')
-rw-r--r--libavcodec/ffv1.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1.h b/libavcodec/ffv1.h
index 6c88565be5..c16fdc4fca 100644
--- a/libavcodec/ffv1.h
+++ b/libavcodec/ffv1.h
@@ -129,7 +129,7 @@ int ffv1_init_slices_state(FFV1Context *f);
int ffv1_init_slice_contexts(FFV1Context *f);
int ffv1_allocate_initial_states(FFV1Context *f);
void ffv1_clear_slice_state(FFV1Context *f, FFV1Context *fs);
-int ffv1_common_end(AVCodecContext *avctx);
+int ffv1_close(AVCodecContext *avctx);
static av_always_inline int fold(int diff, int bits)
{