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/ffv1dec.c | |
| parent | e4255eaf47373c0c1691cbcbc0816253e938b662 (diff) | |
| parent | 71f7b22dba60524b2285643ae0b49d8f64977129 (diff) | |
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/ffv1dec.c')
| -rw-r--r-- | libavcodec/ffv1dec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/ffv1dec.c b/libavcodec/ffv1dec.c index a39ae85c32..1197dbce84 100644 --- a/libavcodec/ffv1dec.c +++ b/libavcodec/ffv1dec.c @@ -835,7 +835,7 @@ AVCodec ff_ffv1_decoder = { .id = AV_CODEC_ID_FFV1, .priv_data_size = sizeof(FFV1Context), .init = decode_init, - .close = ffv1_common_end, + .close = ffv1_close, .decode = decode_frame, .capabilities = CODEC_CAP_DR1 /*| CODEC_CAP_DRAW_HORIZ_BAND*/ | CODEC_CAP_SLICE_THREADS, |