[FFmpeg-cvslog] Merge commit '30015305f3b523ed7640f2c3c58b017140533c58'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <u at pkh.me> | Mon Mar 27 22:16:50 2017 +0200| [fa85d8dbb43e2e84e1fbb9d41c712b2960e17a32] | committer: Clément Bœsch

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 at pkh.me>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fa85d8dbb43e2e84e1fbb9d41c712b2960e17a32
---

 libavcodec/roqvideodec.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 4c5dec5..0ab7d39 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;
     }
 


======================================================================