[FFmpeg-cvslog] Use avpriv_request_sample() where appropriate

[Diego Biurrun]

ffmpeg | branch: master | Diego Biurrun <diego at biurrun.de> | Wed Dec 16 18:02:04 2015 +0100| [30015305f3b523ed7640f2c3c58b017140533c58] | committer: Diego Biurrun

Use avpriv_request_sample() where appropriate

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

 libavcodec/flicvideo.c   | 14 +++-----------
 libavcodec/roqvideodec.c |  3 +--
 2 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/libavcodec/flicvideo.c b/libavcodec/flicvideo.c
index 13e6ae4..b4556dc 100644
--- a/libavcodec/flicvideo.c
+++ b/libavcodec/flicvideo.c
@@ -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 */
diff --git a/libavcodec/roqvideodec.c b/libavcodec/roqvideodec.c
index 4f778dc..d141064 100644
--- a/libavcodec/roqvideodec.c
+++ b/libavcodec/roqvideodec.c
@@ -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;
     }