virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Merge commit '30015305f3b523ed7640f2c3c58b017140533c58'

Browse Source 
* commit '30015305f3b523ed7640f2c3c58b017140533c58':
  Use avpriv_request_sample() where appropriate

Only the roqvideo chunk is merged because we actually support 24bpp
flic, see 5781c983d880e17ffc9b283baa9fb13bad1748f9.

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-27 22:16:50 +02:00
commit fa85d8dbb4
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/roqvideodec.c
View File

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