[FFmpeg-cvslog] lavc: Remove CR/LF from avpriv_request_sample() calls.

Carl Eugen Hoyos git at videolan.org
Sat Dec 3 16:42:27 EET 2016


ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sat Dec  3 15:40:26 2016 +0100| [a8cb567e559a99c27bd936a81422147cb23e77a6] | committer: Carl Eugen Hoyos

lavc: Remove CR/LF from avpriv_request_sample() calls.

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

 libavcodec/aacdec_template.c | 2 +-
 libavcodec/dnxhddec.c        | 2 +-
 libavcodec/m101.c            | 4 ++--
 libavcodec/svq3.c            | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/aacdec_template.c b/libavcodec/aacdec_template.c
index 883ed52..8cfa34b 100644
--- a/libavcodec/aacdec_template.c
+++ b/libavcodec/aacdec_template.c
@@ -452,7 +452,7 @@ static int output_configure(AACContext *ac,
         int id =           layout_map[i][1];
         id_map[type][id] = type_counts[type]++;
         if (id_map[type][id] >= MAX_ELEM_ID) {
-            avpriv_request_sample(ac->avctx, "Remapped id too large\n");
+            avpriv_request_sample(ac->avctx, "Too large remapped id");
             return AVERROR_PATCHWELCOME;
         }
     }
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index 4d1b006..70ce264 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -234,7 +234,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame *frame,
     ctx->is_444 = (buf[0x2C] >> 6) & 1;
     if (ctx->is_444) {
         if (bitdepth == 8) {
-            avpriv_request_sample(ctx->avctx, "4:4:4 8 bits\n");
+            avpriv_request_sample(ctx->avctx, "4:4:4 8 bits");
             return AVERROR_INVALIDDATA;
         } else if (bitdepth == 10) {
             ctx->decode_dct_block = dnxhd_decode_dct_block_10_444;
diff --git a/libavcodec/m101.c b/libavcodec/m101.c
index 939d337..d254966 100644
--- a/libavcodec/m101.c
+++ b/libavcodec/m101.c
@@ -27,7 +27,7 @@
 static av_cold int m101_decode_init(AVCodecContext *avctx)
 {
     if (avctx->extradata_size < 6*4) {
-        avpriv_request_sample(avctx, "Missing or too small extradata (size %d)\n", avctx->extradata_size);
+        avpriv_request_sample(avctx, "Missing or too small extradata (size %d)", avctx->extradata_size);
         return AVERROR_INVALIDDATA;
     }
 
@@ -36,7 +36,7 @@ static av_cold int m101_decode_init(AVCodecContext *avctx)
     else if (avctx->extradata[2*4] == 8) {
         avctx->pix_fmt = AV_PIX_FMT_YUYV422;
     } else {
-        avpriv_request_sample(avctx, "BPS %d\n", avctx->extradata[2*4]);
+        avpriv_request_sample(avctx, "BPS %d", avctx->extradata[2*4]);
         return AVERROR_INVALIDDATA;
     }
 
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c
index 5aedc1e..e0747d5 100644
--- a/libavcodec/svq3.c
+++ b/libavcodec/svq3.c
@@ -1556,7 +1556,7 @@ static int svq3_decode_frame(AVCodecContext *avctx, void *data,
                         return -1;
                 }
                 if (s->slice_type != s->pict_type) {
-                    avpriv_request_sample(avctx, "non constant slice type\n");
+                    avpriv_request_sample(avctx, "non constant slice type");
                 }
                 /* TODO: support s->mb_skip_run */
             }



More information about the ffmpeg-cvslog mailing list