diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:20:13 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 13:20:13 +0100 |
| commit | 95a2b883e36d3499c6bf620c65ac9d21fa2bd808 (patch) | |
| tree | a7e4297b5e5e88db35d355d87e0d9f9fdec7d4d3 | |
| parent | 8a04ddeb4704e1f3c7237d48d95edae08a3193fe (diff) | |
| parent | 69a68593ce5684409c3c4dd9a901bfd8b16925b1 (diff) | |
| download | ffmpeg-95a2b883e36d3499c6bf620c65ac9d21fa2bd808.tar.gz | |
Merge commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1'
* commit '69a68593ce5684409c3c4dd9a901bfd8b16925b1':
Remove stray line breaks from avpriv_{report_missing_feature|request_samples}
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
| -rw-r--r-- | libavcodec/exr.c | 3 | ||||
| -rw-r--r-- | libavcodec/ivi.c | 2 | ||||
| -rw-r--r-- | libavformat/lxfdec.c | 2 | ||||
| -rw-r--r-- | libavformat/rtpdec_hevc.c | 4 |
4 files changed, 5 insertions, 6 deletions
diff --git a/libavcodec/exr.c b/libavcodec/exr.c index cf283741c7..c8c758e0a3 100644 --- a/libavcodec/exr.c +++ b/libavcodec/exr.c @@ -1130,8 +1130,7 @@ static int decode_header(EXRContext *s) current_pixel_type = bytestream2_get_le32(&ch_gb); if (current_pixel_type >= EXR_UNKNOWN) { - avpriv_report_missing_feature(s->avctx, - "Pixel type %d.\n", + avpriv_report_missing_feature(s->avctx, "Pixel type %d", current_pixel_type); return AVERROR_PATCHWELCOME; } diff --git a/libavcodec/ivi.c b/libavcodec/ivi.c index eab42bb535..e7799003e6 100644 --- a/libavcodec/ivi.c +++ b/libavcodec/ivi.c @@ -1084,7 +1084,7 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, } if (ctx->gop_flags & IVI5_IS_PROTECTED) { - avpriv_report_missing_feature(avctx, "Password-protected clip!\n"); + avpriv_report_missing_feature(avctx, "Password-protected clip"); return AVERROR_PATCHWELCOME; } diff --git a/libavformat/lxfdec.c b/libavformat/lxfdec.c index 696e112c2d..c00b4bdea5 100644 --- a/libavformat/lxfdec.c +++ b/libavformat/lxfdec.c @@ -130,7 +130,7 @@ static int get_packet_header(AVFormatContext *s) version = bytestream_get_le32(&p); header_size = bytestream_get_le32(&p); if (version > 1) - avpriv_request_sample(s, "Unknown format version %"PRIu32"\n", version); + avpriv_request_sample(s, "Format version %"PRIu32, version); if (header_size < (version ? 72 : 60) || header_size > LXF_MAX_PACKET_HEADER_SIZE || diff --git a/libavformat/rtpdec_hevc.c b/libavformat/rtpdec_hevc.c index 815a72c2b2..1f09a08aa4 100644 --- a/libavformat/rtpdec_hevc.c +++ b/libavformat/rtpdec_hevc.c @@ -222,7 +222,7 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx /* sanity check for correct layer ID */ if (lid) { /* future scalable or 3D video coding extensions */ - avpriv_report_missing_feature(ctx, "Multi-layer HEVC coding\n"); + avpriv_report_missing_feature(ctx, "Multi-layer HEVC coding"); return AVERROR_PATCHWELCOME; } @@ -338,7 +338,7 @@ static int hevc_handle_packet(AVFormatContext *ctx, PayloadContext *rtp_hevc_ctx /* PACI packet */ case 50: /* Temporal scalability control information (TSCI) */ - avpriv_report_missing_feature(ctx, "PACI packets for RTP/HEVC\n"); + avpriv_report_missing_feature(ctx, "PACI packets for RTP/HEVC"); res = AVERROR_PATCHWELCOME; break; } |