diff options
| author | addr-see-the-website@aetey.se <addr-see-the-website@aetey.se> | 2014-02-02 16:57:36 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-03 02:04:38 +0100 |
| commit | 8e36fc0c33566cb6fcb6379595214e7f9b909f88 (patch) | |
| tree | c35c54499a4938c3fe0d86f0e9a2c4538ecd64d4 /libavcodec/roqvideoenc.c | |
| parent | 1bc2fa447c22df09d312a7fba7e95531cfb051f8 (diff) | |
| download | ffmpeg-8e36fc0c33566cb6fcb6379595214e7f9b909f88.tar.gz | |
RoQ encoder: support different integer framerates
Even though the most common framerate for RoQ is 30fps,
the format supports other framerates too.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/roqvideoenc.c')
| -rw-r--r-- | libavcodec/roqvideoenc.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/roqvideoenc.c b/libavcodec/roqvideoenc.c index 22ebec67a3..4b96934a65 100644 --- a/libavcodec/roqvideoenc.c +++ b/libavcodec/roqvideoenc.c @@ -963,7 +963,7 @@ static av_cold int roq_encode_init(AVCodecContext *avctx) enc->framesSinceKeyframe = 0; if ((avctx->width & 0xf) || (avctx->height & 0xf)) { av_log(avctx, AV_LOG_ERROR, "Dimensions must be divisible by 16\n"); - return -1; + return AVERROR(EINVAL); } if (((avctx->width)&(avctx->width-1))||((avctx->height)&(avctx->height-1))) @@ -1097,7 +1097,6 @@ AVCodec ff_roq_encoder = { .init = roq_encode_init, .encode2 = roq_encode_frame, .close = roq_encode_end, - .supported_framerates = (const AVRational[]){ {30,1}, {0,0} }, .pix_fmts = (const enum AVPixelFormat[]){ AV_PIX_FMT_YUV444P, AV_PIX_FMT_NONE }, .priv_class = &roq_class, |