diff options
| author | Clément Bœsch <u@pkh.me> | 2017-03-27 22:16:50 +0200 |
|---|---|---|
| committer | Clément Bœsch <u@pkh.me> | 2017-03-27 22:18:26 +0200 |
| commit | fa85d8dbb43e2e84e1fbb9d41c712b2960e17a32 (patch) | |
| tree | 1113bf57a740f111a44d203ce2b4db09f48f2868 | |
| parent | 9fec43902c993e6bdf7d57f176160c04c6ec2437 (diff) | |
| parent | 30015305f3b523ed7640f2c3c58b017140533c58 (diff) | |
| download | ffmpeg-fa85d8dbb43e2e84e1fbb9d41c712b2960e17a32.tar.gz | |
Merge commit '30015305f3b523ed7640f2c3c58b017140533c58'
* 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>
| -rw-r--r-- | libavcodec/roqvideodec.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c index 4c5dec52bc..0ab7d399d6 100644 --- a/libavcodec/roqvideodec.c +++ b/libavcodec/roqvideodec.c @@ -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; } |