diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 14:35:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-21 14:37:15 +0200 |
| commit | 69fd0b7adbd22f24d45b6edb10eaf37d18c66bee (patch) | |
| tree | 9ed4b452f0f2668e0319825e1c341a6c4e7b7bfb /libavcodec/ffv1.c | |
| parent | e4255eaf47373c0c1691cbcbc0816253e938b662 (diff) | |
| parent | 71f7b22dba60524b2285643ae0b49d8f64977129 (diff) | |
| download | android_external_ffmpeg-69fd0b7adbd22f24d45b6edb10eaf37d18c66bee.tar.gz android_external_ffmpeg-69fd0b7adbd22f24d45b6edb10eaf37d18c66bee.tar.bz2 android_external_ffmpeg-69fd0b7adbd22f24d45b6edb10eaf37d18c66bee.zip | |
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.c')
| -rw-r--r-- | libavcodec/ffv1.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1.c b/libavcodec/ffv1.c index 717477ca27..4ea071057f 100644 --- a/libavcodec/ffv1.c +++ b/libavcodec/ffv1.c @@ -180,7 +180,7 @@ void ffv1_clear_slice_state(FFV1Context *f, FFV1Context *fs) } -av_cold int ffv1_common_end(AVCodecContext *avctx) +av_cold int ffv1_close(AVCodecContext *avctx) { FFV1Context *s = avctx->priv_data; int i, j; |