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 | |
| parent | e4255eaf47373c0c1691cbcbc0816253e938b662 (diff) | |
| parent | 71f7b22dba60524b2285643ae0b49d8f64977129 (diff) | |
| download | ffmpeg-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>
| -rw-r--r-- | libavcodec/ffv1.c | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1.h | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1dec.c | 2 | ||||
| -rw-r--r-- | libavcodec/ffv1enc.c | 2 |
4 files changed, 4 insertions, 4 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; 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) { 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, diff --git a/libavcodec/ffv1enc.c b/libavcodec/ffv1enc.c index dd52329fcb..be0d78285e 100644 --- a/libavcodec/ffv1enc.c +++ b/libavcodec/ffv1enc.c @@ -1124,7 +1124,7 @@ AVCodec ff_ffv1_encoder = { .priv_data_size = sizeof(FFV1Context), .init = encode_init, .encode2 = encode_frame, - .close = ffv1_common_end, + .close = ffv1_close, .capabilities = CODEC_CAP_SLICE_THREADS, .defaults = ffv1_defaults, .pix_fmts = (const enum AVPixelFormat[]) { |