RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2012-10-21 14:35:47 +02:00
parent e4255eaf47 71f7b22dba
commit 69fd0b7adb
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/ffv1.c
View File

@ -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;

2
libavcodec/ffv1.h
View File

@ -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)
{

2
libavcodec/ffv1dec.c
View File

@ -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,

2
libavcodec/ffv1enc.c
View File

@ -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[]) {