videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-03 01:39:58 +02:00
Code Releases Activity

Use avpriv_request_sample() where appropriate

Browse Source
This commit is contained in:
Diego Biurrun 2015-12-16 18:02:04 +01:00
parent 07cac07c0c
commit 30015305f3
2 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavcodec/flicvideo.c
View File

@ -116,7 +116,7 @@ static av_cold int flic_decode_init(AVCodecContext *avctx)
case 15 : avctx->pix_fmt = AV_PIX_FMT_RGB555; break;
case 16 : avctx->pix_fmt = AV_PIX_FMT_RGB565; break;
case 24 : avctx->pix_fmt = AV_PIX_FMT_BGR24; /* Supposedly BGR, but no files to test with */
av_log(avctx, AV_LOG_ERROR, "24Bpp FLC/FLX is unsupported due to no test files.\n");
avpriv_request_sample(avctx, "24bpp FLC/FLX");
return AVERROR_PATCHWELCOME;
default :
av_log(avctx, AV_LOG_ERROR, "Unknown FLC/FLX depth of %d Bpp is unsupported.\n",depth);
@ -695,14 +695,6 @@ static int flic_decode_frame_15_16BPP(AVCodecContext *avctx,
return buf_size;
}
static int flic_decode_frame_24BPP(AVCodecContext *avctx,
void *data, int *got_frame,
const uint8_t *buf, int buf_size)
{
av_log(avctx, AV_LOG_ERROR, "24Bpp FLC Unsupported due to lack of test files.\n");
return AVERROR_PATCHWELCOME;
}
static int flic_decode_frame(AVCodecContext *avctx,
void *data, int *got_frame,
AVPacket *avpkt)
@ -719,8 +711,8 @@ static int flic_decode_frame(AVCodecContext *avctx,
buf, buf_size);
}
else if (avctx->pix_fmt == AV_PIX_FMT_BGR24) {
return flic_decode_frame_24BPP(avctx, data, got_frame,
buf, buf_size);
avpriv_request_sample(avctx, "24bpp FLC");
return AVERROR_PATCHWELCOME;
}
/* Should not get here, ever as the pix_fmt is processed */

3
libavcodec/roqvideodec.c
View File

@ -164,8 +164,7 @@ static av_cold int roq_decode_init(AVCodecContext *avctx)
s->avctx = avctx;
if (avctx->width % 16 || avctx->height % 16) {
av_log(avctx, AV_LOG_ERROR,
"Dimensions must be a multiple of 16\n");
avpriv_request_sample(avctx, "Dimensions not being a multiple of 16");
return AVERROR_PATCHWELCOME;
}