diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:36:35 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-14 15:36:35 +0100 |
| commit | f9d5bdd0f6526e852ec37528c9b5f97beb71ef07 (patch) | |
| tree | 3fce75f86b6fc11866615307a7d6bfc0498cc5b1 /libavcodec/vcr1.c | |
| parent | 4adc8a29a0565cb35815eeb8e693b47dcaf890ce (diff) | |
| parent | 1a31dff9370b4732c91df5cb1ca4b39f2cb3050e (diff) | |
| download | ffmpeg-f9d5bdd0f6526e852ec37528c9b5f97beb71ef07.tar.gz | |
Merge commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e'
* commit '1a31dff9370b4732c91df5cb1ca4b39f2cb3050e':
loco: return meaningful error codes.
flicvideo: return meaningful error codes.
vcr1: remove disabled encoder stub
Conflicts:
libavcodec/flicvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/vcr1.c')
| -rw-r--r-- | libavcodec/vcr1.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c index e51ef15dbc..2dc12c88ce 100644 --- a/libavcodec/vcr1.c +++ b/libavcodec/vcr1.c @@ -159,42 +159,3 @@ AVCodec ff_vcr1_decoder = { .capabilities = CODEC_CAP_DR1, .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; - -/* Disable the encoder. */ -#undef CONFIG_VCR1_ENCODER -#define CONFIG_VCR1_ENCODER 0 - -#if CONFIG_VCR1_ENCODER - -#include "put_bits.h" - -static int vcr1_encode_frame(AVCodecContext *avctx, unsigned char *buf, - int buf_size, void *data) -{ - VCR1Context *const a = avctx->priv_data; - AVFrame *pict = data; - AVFrame *const p = &a->picture; - int size; - - *p = *pict; - p->pict_type = AV_PICTURE_TYPE_I; - p->key_frame = 1; - - avpriv_align_put_bits(&a->pb); - flush_put_bits(&a->pb); - - size = put_bits_count(&a->pb) / 32; - - return size * 4; -} - -AVCodec ff_vcr1_encoder = { - .name = "vcr1", - .type = AVMEDIA_TYPE_VIDEO, - .id = AV_CODEC_ID_VCR1, - .priv_data_size = sizeof(VCR1Context), - .init = vcr1_common_init, - .encode = vcr1_encode_frame, - .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), -}; -#endif /* CONFIG_VCR1_ENCODER */ |