Browse Source

Merge commit '30015305f3b523ed7640f2c3c58b017140533c58'

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

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

Merged-by: Clément Bœsch <u@pkh.me>
tags/n3.3
Clément Bœsch 8 years ago
parent
commit
fa85d8dbb4
1 changed files with 1 additions and 2 deletions
  1. +1
    -2
      libavcodec/roqvideodec.c

+ 1
- 2
libavcodec/roqvideodec.c View File

@@ -175,8 +175,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;
}



Loading…
Cancel
Save