This is an automated email from the git hooks/post-receive script. Git pushed a commit to branch release/7.1 in repository ffmpeg.
commit 4543d0509b7cad3a59d79051d5edee62ca29098b Author: Timo Rothenpieler <[email protected]> AuthorDate: Sun Nov 30 17:04:33 2025 +0100 Commit: Timo Rothenpieler <[email protected]> CommitDate: Sun Dec 7 15:54:59 2025 +0000 all: apply linter fixes --- COPYING.LGPLv2.1 | 18 +++++++++--------- doc/build_system.txt | 1 - doc/infra.txt | 1 - doc/nut.texi | 1 - doc/texi2pod.pl | 0 doc/texidep.pl | 0 doc/undefined.txt | 1 - libavcodec/arm/int_neon.S | 1 - libavcodec/cljrdec.c | 1 - libavcodec/dv_profile.c | 1 - libavcodec/ffv1_template.c | 1 - libavcodec/ffv1enc_template.c | 1 - libavcodec/h264_mc_template.c | 1 - libavcodec/hevc/cabac.c | 1 - libavcodec/imgconvert.c | 1 - libavcodec/mpegaudiodsp_template.c | 1 - libavcodec/mpegaudioenc_template.c | 1 - libavcodec/mpv_reconstruct_mb_template.c | 1 - libavcodec/msmpeg4.c | 1 - libavcodec/opus/parse.c | 1 - libavcodec/snow_dwt.c | 2 -- libavcodec/vvc/intra.c | 1 - libavcodec/x86/fmtconvert.asm | 1 - libavcodec/x86/mpegvideoencdsp.asm | 1 - libavfilter/aarch64/vf_bwdif_init_aarch64.c | 1 - libavfilter/dnn/dnn_interface.c | 1 - libavfilter/perlin.c | 1 - libavfilter/qp_table.c | 1 - libavfilter/scene_sad.c | 1 - libavfilter/textutils.c | 1 - libavfilter/vf_overlay_cuda.cu | 1 - libavfilter/vf_quirc.c | 1 - libavformat/dash.c | 2 -- libavformat/g726.c | 1 - libavformat/hls_sample_encryption.h | 1 - libavformat/hlsplaylist.c | 1 - libavformat/rdt.c | 1 - libavutil/aes.c | 1 - libavutil/hwcontext_cuda_internal.h | 1 - libavutil/hwcontext_qsv.h | 1 - libavutil/tests/blowfish.c | 1 - libswresample/aarch64/resample.S | 8 ++++---- libswresample/soxr_resample.c | 1 - libswresample/swresample_frame.c | 1 - libswresample/version.c | 1 - libswscale/aarch64/yuv2rgb_neon.S | 10 +++++----- libswscale/gamma.c | 1 - libswscale/vscale.c | 2 -- tests/extended.ffconcat | 1 - tests/fate/ffprobe.mak | 1 - tests/fate/lossless-audio.mak | 1 - tests/simple1.ffconcat | 1 - tests/simple2.ffconcat | 1 - 53 files changed, 18 insertions(+), 69 deletions(-) diff --git a/COPYING.LGPLv2.1 b/COPYING.LGPLv2.1 index 58af0d3787..40924c2a6d 100644 --- a/COPYING.LGPLv2.1 +++ b/COPYING.LGPLv2.1 @@ -55,7 +55,7 @@ modified by someone else and passed on, the recipients should know that what they have is not the original version, so that the original author's reputation will not be affected by problems that might be introduced by others. - + Finally, software patents pose a constant threat to the existence of any free program. We wish to make sure that a company cannot effectively restrict the users of a free program by obtaining a @@ -111,7 +111,7 @@ modification follow. Pay close attention to the difference between a "work based on the library" and a "work that uses the library". The former contains code derived from the library, whereas the latter must be combined with the library in order to run. - + GNU LESSER GENERAL PUBLIC LICENSE TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION @@ -158,7 +158,7 @@ Library. You may charge a fee for the physical act of transferring a copy, and you may at your option offer warranty protection in exchange for a fee. - + 2. You may modify your copy or copies of the Library or any portion of it, thus forming a work based on the Library, and copy and distribute such modifications or work under the terms of Section 1 @@ -216,7 +216,7 @@ instead of to this License. (If a newer version than version 2 of the ordinary GNU General Public License has appeared, then you can specify that version instead if you wish.) Do not make any other change in these notices. - + Once this change is made in a given copy, it is irreversible for that copy, so the ordinary GNU General Public License applies to all subsequent copies and derivative works made from that copy. @@ -267,7 +267,7 @@ Library will still fall under Section 6.) distribute the object code for the work under the terms of Section 6. Any executables containing that work also fall under Section 6, whether or not they are linked directly with the Library itself. - + 6. As an exception to the Sections above, you may also combine or link a "work that uses the Library" with the Library to produce a work containing portions of the Library, and distribute that work @@ -329,7 +329,7 @@ restrictions of other proprietary libraries that do not normally accompany the operating system. Such a contradiction means you cannot use both them and the Library together in an executable that you distribute. - + 7. You may place library facilities that are a work based on the Library side-by-side in a single library together with other library facilities not covered by this License, and distribute such a combined @@ -370,7 +370,7 @@ subject to these terms and conditions. You may not impose any further restrictions on the recipients' exercise of the rights granted herein. You are not responsible for enforcing compliance by third parties with this License. - + 11. If, as a consequence of a court judgment or allegation of patent infringement or for any other reason (not limited to patent issues), conditions are imposed on you (whether by court order, agreement or @@ -422,7 +422,7 @@ conditions either of that version or of any later version published by the Free Software Foundation. If the Library does not specify a license version number, you may choose any version ever published by the Free Software Foundation. - + 14. If you wish to incorporate parts of the Library into other free programs whose distribution conditions are incompatible with these, write to the author to ask for permission. For software which is @@ -456,7 +456,7 @@ SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH DAMAGES. END OF TERMS AND CONDITIONS - + How to Apply These Terms to Your New Libraries If you develop a new library, and you want it to be of the greatest diff --git a/doc/build_system.txt b/doc/build_system.txt index 0b1b0c2054..a0aa17bdad 100644 --- a/doc/build_system.txt +++ b/doc/build_system.txt @@ -63,4 +63,3 @@ make -j<num> make -k Continue build in case of errors, this is useful for the regression tests sometimes but note that it will still not run all reg tests. - diff --git a/doc/infra.txt b/doc/infra.txt index 79d4e56719..37aaef34b7 100644 --- a/doc/infra.txt +++ b/doc/infra.txt @@ -96,4 +96,3 @@ IRC: ~~~~ irc channels are at https://libera.chat/ irc channel archives are at https://libera.irclog.whitequark.org - diff --git a/doc/nut.texi b/doc/nut.texi index f9b18f5660..d3a5b8de39 100644 --- a/doc/nut.texi +++ b/doc/nut.texi @@ -157,4 +157,3 @@ PFD[32] would for example be signed 32 bit little-endian IEEE float @item XVID @tab non-compliant MPEG-4 generated by old Xvid @item XVIX @tab non-compliant MPEG-4 generated by old Xvid with interlacing bug @end multitable - diff --git a/doc/texi2pod.pl b/doc/texi2pod.pl old mode 100644 new mode 100755 diff --git a/doc/texidep.pl b/doc/texidep.pl old mode 100644 new mode 100755 diff --git a/doc/undefined.txt b/doc/undefined.txt index e01299bef1..faf8816c66 100644 --- a/doc/undefined.txt +++ b/doc/undefined.txt @@ -44,4 +44,3 @@ a+b*c; here the reader knows that a,b,c are meant to be signed integers but for C standard compliance / to avoid undefined behavior they are stored in unsigned ints. - diff --git a/libavcodec/arm/int_neon.S b/libavcodec/arm/int_neon.S index 72c4c77c45..3c58b72842 100644 --- a/libavcodec/arm/int_neon.S +++ b/libavcodec/arm/int_neon.S @@ -48,4 +48,3 @@ function ff_scalarproduct_int16_neon, export=1 vmov.32 r0, d3[0] bx lr endfunc - diff --git a/libavcodec/cljrdec.c b/libavcodec/cljrdec.c index 66e9d56e0e..79fbea990f 100644 --- a/libavcodec/cljrdec.c +++ b/libavcodec/cljrdec.c @@ -88,4 +88,3 @@ const FFCodec ff_cljr_decoder = { FF_CODEC_DECODE_CB(decode_frame), .p.capabilities = AV_CODEC_CAP_DR1, }; - diff --git a/libavcodec/dv_profile.c b/libavcodec/dv_profile.c index f403114184..02ece47e01 100644 --- a/libavcodec/dv_profile.c +++ b/libavcodec/dv_profile.c @@ -337,4 +337,3 @@ const AVDVProfile *av_dv_codec_profile2(int width, int height, return p; } - diff --git a/libavcodec/ffv1_template.c b/libavcodec/ffv1_template.c index abb90a12e4..005a32c296 100644 --- a/libavcodec/ffv1_template.c +++ b/libavcodec/ffv1_template.c @@ -50,4 +50,3 @@ static inline int RENAME(get_context)(const int16_t quant_table[MAX_CONTEXT_INPU quant_table[1][(LT - T) & MAX_QUANT_TABLE_MASK] + quant_table[2][(T - RT) & MAX_QUANT_TABLE_MASK]; } - diff --git a/libavcodec/ffv1enc_template.c b/libavcodec/ffv1enc_template.c index bc14926ab9..a60490f65d 100644 --- a/libavcodec/ffv1enc_template.c +++ b/libavcodec/ffv1enc_template.c @@ -208,4 +208,3 @@ static int RENAME(encode_rgb_frame)(FFV1Context *f, FFV1SliceContext *sc, } return 0; } - diff --git a/libavcodec/h264_mc_template.c b/libavcodec/h264_mc_template.c index d02e2bf580..d24b0a0edc 100644 --- a/libavcodec/h264_mc_template.c +++ b/libavcodec/h264_mc_template.c @@ -162,4 +162,3 @@ static void MCFUNC(hl_motion)(const H264Context *h, H264SliceContext *sl, if (USES_LIST(mb_type, 1)) prefetch_motion(h, sl, 1, PIXEL_SHIFT, CHROMA_IDC); } - diff --git a/libavcodec/hevc/cabac.c b/libavcodec/hevc/cabac.c index 892dd1c215..55d5741f87 100644 --- a/libavcodec/hevc/cabac.c +++ b/libavcodec/hevc/cabac.c @@ -1512,4 +1512,3 @@ void ff_hevc_hls_mvd_coding(HEVCLocalContext *lc, int x0, int y0, int log2_cb_si case 0: lc->pu.mvd.y = 0; break; } } - diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c index 96511ac7d6..86cfce1e46 100644 --- a/libavcodec/imgconvert.c +++ b/libavcodec/imgconvert.c @@ -45,4 +45,3 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const enum AVPixelFormat *p *loss_ptr = loss; return best; } - diff --git a/libavcodec/mpegaudiodsp_template.c b/libavcodec/mpegaudiodsp_template.c index fbbd94e486..6e8b84664e 100644 --- a/libavcodec/mpegaudiodsp_template.c +++ b/libavcodec/mpegaudiodsp_template.c @@ -369,4 +369,3 @@ void RENAME(ff_imdct36_blocks)(INTFLOAT *out, INTFLOAT *buf, INTFLOAT *in, out++; } } - diff --git a/libavcodec/mpegaudioenc_template.c b/libavcodec/mpegaudioenc_template.c index 396e8a4899..adb88cd684 100644 --- a/libavcodec/mpegaudioenc_template.c +++ b/libavcodec/mpegaudioenc_template.c @@ -778,4 +778,3 @@ static const FFCodecDefault mp2_defaults[] = { { "b", "0" }, { NULL }, }; - diff --git a/libavcodec/mpv_reconstruct_mb_template.c b/libavcodec/mpv_reconstruct_mb_template.c index dca982ae0f..50f76fa229 100644 --- a/libavcodec/mpv_reconstruct_mb_template.c +++ b/libavcodec/mpv_reconstruct_mb_template.c @@ -282,4 +282,3 @@ void mpv_reconstruct_mb_internal(MpegEncContext *s, int16_t block[12][64], } } } - diff --git a/libavcodec/msmpeg4.c b/libavcodec/msmpeg4.c index 872dc8db67..01e6f3ccc0 100644 --- a/libavcodec/msmpeg4.c +++ b/libavcodec/msmpeg4.c @@ -336,4 +336,3 @@ int ff_msmpeg4_pred_dc(MpegEncContext *s, int n, *dc_val_ptr = &dc_val[0]; return pred; } - diff --git a/libavcodec/opus/parse.c b/libavcodec/opus/parse.c index 78a2a75fc7..687199b1bb 100644 --- a/libavcodec/opus/parse.c +++ b/libavcodec/opus/parse.c @@ -466,4 +466,3 @@ fail: av_channel_layout_uninit(&layout); return ret; } - diff --git a/libavcodec/snow_dwt.c b/libavcodec/snow_dwt.c index 1250597ee0..26a8b9adc2 100644 --- a/libavcodec/snow_dwt.c +++ b/libavcodec/snow_dwt.c @@ -858,5 +858,3 @@ av_cold void ff_dwt_init(SnowDWTContext *c) ff_dwt_init_x86(c); #endif } - - diff --git a/libavcodec/vvc/intra.c b/libavcodec/vvc/intra.c index c08e79df7e..e04129d3be 100644 --- a/libavcodec/vvc/intra.c +++ b/libavcodec/vvc/intra.c @@ -693,4 +693,3 @@ int ff_vvc_reconstruct(VVCLocalContext *lc, const int rs, const int rx, const in ff_vvc_ctu_free_cus(fc->tab.cus + rs); return ret; } - diff --git a/libavcodec/x86/fmtconvert.asm b/libavcodec/x86/fmtconvert.asm index e70df4662d..99c5efeab0 100644 --- a/libavcodec/x86/fmtconvert.asm +++ b/libavcodec/x86/fmtconvert.asm @@ -85,4 +85,3 @@ cglobal int32_to_float_fmul_array8, 5, 5, 5, c, dst, src, mul, len INIT_XMM sse2 INT32_TO_FLOAT_FMUL_ARRAY8 - diff --git a/libavcodec/x86/mpegvideoencdsp.asm b/libavcodec/x86/mpegvideoencdsp.asm index c73b359c42..d12646ae54 100644 --- a/libavcodec/x86/mpegvideoencdsp.asm +++ b/libavcodec/x86/mpegvideoencdsp.asm @@ -104,4 +104,3 @@ cglobal pix_norm1, 2, 3, %1 INIT_XMM sse2 PIX_NORM1 6, 8 - diff --git a/libavfilter/aarch64/vf_bwdif_init_aarch64.c b/libavfilter/aarch64/vf_bwdif_init_aarch64.c index 74530ed5b7..efcb31efff 100644 --- a/libavfilter/aarch64/vf_bwdif_init_aarch64.c +++ b/libavfilter/aarch64/vf_bwdif_init_aarch64.c @@ -122,4 +122,3 @@ ff_bwdif_init_aarch64(BWDIFDSPContext *s, int bit_depth) s->filter_edge = filter_edge_helper; s->filter_line3 = filter_line3_helper; } - diff --git a/libavfilter/dnn/dnn_interface.c b/libavfilter/dnn/dnn_interface.c index bb477348dc..c4e410756b 100644 --- a/libavfilter/dnn/dnn_interface.c +++ b/libavfilter/dnn/dnn_interface.c @@ -137,4 +137,3 @@ const AVClass *ff_dnn_child_class_iterate_with_mask(void **iter, uint32_t backen return NULL; } - diff --git a/libavfilter/perlin.c b/libavfilter/perlin.c index ffad8c1e4e..ac8272df14 100644 --- a/libavfilter/perlin.c +++ b/libavfilter/perlin.c @@ -221,4 +221,3 @@ double ff_perlin_get(FFPerlin *perlin, double x, double y, double z) return total / max_value; } - diff --git a/libavfilter/qp_table.c b/libavfilter/qp_table.c index 8137dc019f..a30e1a9190 100644 --- a/libavfilter/qp_table.c +++ b/libavfilter/qp_table.c @@ -66,4 +66,3 @@ int ff_qp_table_extract(AVFrame *frame, int8_t **table, int *table_w, int *table return 0; } - diff --git a/libavfilter/scene_sad.c b/libavfilter/scene_sad.c index caf911eb5d..91c4e89342 100644 --- a/libavfilter/scene_sad.c +++ b/libavfilter/scene_sad.c @@ -70,4 +70,3 @@ ff_scene_sad_fn ff_scene_sad_get_fn(int depth) } return sad; } - diff --git a/libavfilter/textutils.c b/libavfilter/textutils.c index e6b5239b20..568e350989 100644 --- a/libavfilter/textutils.c +++ b/libavfilter/textutils.c @@ -380,4 +380,3 @@ int ff_load_textfile(void *log_ctx, const char *textfile, return 0; } - diff --git a/libavfilter/vf_overlay_cuda.cu b/libavfilter/vf_overlay_cuda.cu index 43ec36c2ed..9f1db0e9aa 100644 --- a/libavfilter/vf_overlay_cuda.cu +++ b/libavfilter/vf_overlay_cuda.cu @@ -51,4 +51,3 @@ __global__ void Overlay_Cuda( } } - diff --git a/libavfilter/vf_quirc.c b/libavfilter/vf_quirc.c index afd172fa34..2aee81b4d5 100644 --- a/libavfilter/vf_quirc.c +++ b/libavfilter/vf_quirc.c @@ -182,4 +182,3 @@ const AVFilter ff_vf_quirc = { .flags = AVFILTER_FLAG_SUPPORT_TIMELINE_GENERIC | AVFILTER_FLAG_METADATA_ONLY, }; - diff --git a/libavformat/dash.c b/libavformat/dash.c index d7ba8540d7..fddfa82340 100644 --- a/libavformat/dash.c +++ b/libavformat/dash.c @@ -152,5 +152,3 @@ void ff_dash_fill_tmpl_params(char *dst, size_t buffer_size, t_cur = t_next; } } - - diff --git a/libavformat/g726.c b/libavformat/g726.c index e783fa4123..05b7ba3d3e 100644 --- a/libavformat/g726.c +++ b/libavformat/g726.c @@ -98,4 +98,3 @@ const FFInputFormat ff_g726le_demuxer = { .raw_codec_id = AV_CODEC_ID_ADPCM_G726LE, }; #endif - diff --git a/libavformat/hls_sample_encryption.h b/libavformat/hls_sample_encryption.h index d86eccb74c..e5a2eae01d 100644 --- a/libavformat/hls_sample_encryption.h +++ b/libavformat/hls_sample_encryption.h @@ -63,4 +63,3 @@ int ff_hls_senc_parse_audio_setup_info(AVStream *st, HLSAudioSetupInfo *info); int ff_hls_senc_decrypt_frame(enum AVCodecID codec_id, HLSCryptoContext *crypto_ctx, AVPacket *pkt); #endif /* AVFORMAT_HLS_SAMPLE_ENCRYPTION_H */ - diff --git a/libavformat/hlsplaylist.c b/libavformat/hlsplaylist.c index f8a6977702..bcd257aea6 100644 --- a/libavformat/hlsplaylist.c +++ b/libavformat/hlsplaylist.c @@ -199,4 +199,3 @@ void ff_hls_write_end_list(AVIOContext *out) return; avio_printf(out, "#EXT-X-ENDLIST\n"); } - diff --git a/libavformat/rdt.c b/libavformat/rdt.c index 2fa53d34a8..bb2accfd29 100644 --- a/libavformat/rdt.c +++ b/libavformat/rdt.c @@ -573,4 +573,3 @@ RDT_HANDLER(live_video, "x-pn-multirate-realvideo-live", AVMEDIA_TYPE_VIDEO); RDT_HANDLER(live_audio, "x-pn-multirate-realaudio-live", AVMEDIA_TYPE_AUDIO); RDT_HANDLER(video, "x-pn-realvideo", AVMEDIA_TYPE_VIDEO); RDT_HANDLER(audio, "x-pn-realaudio", AVMEDIA_TYPE_AUDIO); - diff --git a/libavutil/aes.c b/libavutil/aes.c index 2f08fb4164..f79a060b1d 100644 --- a/libavutil/aes.c +++ b/libavutil/aes.c @@ -271,4 +271,3 @@ int av_aes_init(AVAES *a, const uint8_t *key, int key_bits, int decrypt) return 0; } - diff --git a/libavutil/hwcontext_cuda_internal.h b/libavutil/hwcontext_cuda_internal.h index d5633c58d5..a989c45861 100644 --- a/libavutil/hwcontext_cuda_internal.h +++ b/libavutil/hwcontext_cuda_internal.h @@ -36,4 +36,3 @@ struct AVCUDADeviceContextInternal { }; #endif /* AVUTIL_HWCONTEXT_CUDA_INTERNAL_H */ - diff --git a/libavutil/hwcontext_qsv.h b/libavutil/hwcontext_qsv.h index 35530e4e93..3c16a8ab98 100644 --- a/libavutil/hwcontext_qsv.h +++ b/libavutil/hwcontext_qsv.h @@ -84,4 +84,3 @@ typedef struct AVQSVFramesContext { } AVQSVFramesContext; #endif /* AVUTIL_HWCONTEXT_QSV_H */ - diff --git a/libavutil/tests/blowfish.c b/libavutil/tests/blowfish.c index f4c9ced9b4..0dd4d22c9d 100644 --- a/libavutil/tests/blowfish.c +++ b/libavutil/tests/blowfish.c @@ -191,4 +191,3 @@ int main(void) return 0; } - diff --git a/libswresample/aarch64/resample.S b/libswresample/aarch64/resample.S index 6d9eaaeb23..89edd1ce60 100644 --- a/libswresample/aarch64/resample.S +++ b/libswresample/aarch64/resample.S @@ -30,7 +30,7 @@ function ff_resample_common_apply_filter_x4_float_neon, export=1 faddp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values faddp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values st1 {v0.s}[0], [x0], #4 // write accumulator - ret + ret endfunc function ff_resample_common_apply_filter_x8_float_neon, export=1 @@ -46,7 +46,7 @@ function ff_resample_common_apply_filter_x8_float_neon, export=1 faddp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values faddp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values st1 {v0.s}[0], [x0], #4 // write accumulator - ret + ret endfunc function ff_resample_common_apply_filter_x4_s16_neon, export=1 @@ -59,7 +59,7 @@ function ff_resample_common_apply_filter_x4_s16_neon, export=1 addp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values addp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values st1 {v0.s}[0], [x0], #4 // write accumulator - ret + ret endfunc function ff_resample_common_apply_filter_x8_s16_neon, export=1 @@ -73,5 +73,5 @@ function ff_resample_common_apply_filter_x8_s16_neon, export=1 addp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values addp v0.4s, v0.4s, v0.4s // pair adding of the 4x32-bit accumulated values st1 {v0.s}[0], [x0], #4 // write accumulator - ret + ret endfunc diff --git a/libswresample/soxr_resample.c b/libswresample/soxr_resample.c index 8181c749b8..00d79878ca 100644 --- a/libswresample/soxr_resample.c +++ b/libswresample/soxr_resample.c @@ -127,4 +127,3 @@ struct Resampler const swri_soxr_resampler={ create, destroy, process, flush, NULL /* set_compensation */, get_delay, invert_initial_buffer, get_out_samples }; - diff --git a/libswresample/swresample_frame.c b/libswresample/swresample_frame.c index 52e942f9c6..1334f462a4 100644 --- a/libswresample/swresample_frame.c +++ b/libswresample/swresample_frame.c @@ -172,4 +172,3 @@ int swr_convert_frame(SwrContext *s, return convert_frame(s, out, in); } - diff --git a/libswresample/version.c b/libswresample/version.c index 40fbbabf96..06c3d60636 100644 --- a/libswresample/version.c +++ b/libswresample/version.c @@ -43,4 +43,3 @@ const char *swresample_license(void) #define LICENSE_PREFIX "libswresample license: " return &LICENSE_PREFIX FFMPEG_LICENSE[sizeof(LICENSE_PREFIX) - 1]; } - diff --git a/libswscale/aarch64/yuv2rgb_neon.S b/libswscale/aarch64/yuv2rgb_neon.S index cc7d8b58fc..0797a6d5e0 100644 --- a/libswscale/aarch64/yuv2rgb_neon.S +++ b/libswscale/aarch64/yuv2rgb_neon.S @@ -126,7 +126,7 @@ .endm .macro load_chroma_yuv422p - load_chroma_yuv420p + load_chroma_yuv420p .endm .macro increment_nv12 @@ -136,7 +136,7 @@ .endm .macro increment_nv21 - increment_nv12 + increment_nv12 .endm .macro increment_yuv420p @@ -182,7 +182,7 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 mov w8, w0 // w8 = width 2: movi v5.8h, #4, lsl #8 // 128 * (1<<3) - load_chroma_\ifmt + load_chroma_\ifmt sub v18.8h, v18.8h, v5.8h // U*(1<<3) - 128*(1<<3) sub v19.8h, v19.8h, v5.8h // V*(1<<3) - 128*(1<<3) sqdmulh v20.8h, v19.8h, v1.h[0] // V * v2r (R) @@ -237,11 +237,11 @@ function ff_\ifmt\()_to_\ofmt\()_neon, export=1 add x15, x15, w16, sxtw // dst2 += padding2 .endif add x4, x4, w5, sxtw // srcY += paddingY - increment_\ifmt + increment_\ifmt subs w1, w1, #1 // height -= 1 b.gt 1b mov w0, w9 - ret + ret endfunc .endm diff --git a/libswscale/gamma.c b/libswscale/gamma.c index 7c5534e1b7..c62988002d 100644 --- a/libswscale/gamma.c +++ b/libswscale/gamma.c @@ -70,4 +70,3 @@ int ff_init_gamma_convert(SwsFilterDescriptor *desc, SwsSlice * src, uint16_t *t return 0; } - diff --git a/libswscale/vscale.c b/libswscale/vscale.c index 5b3234198d..7515a08f16 100644 --- a/libswscale/vscale.c +++ b/libswscale/vscale.c @@ -319,5 +319,3 @@ void ff_init_vscale_pfn(SwsContext *c, lumCtx->pfn.yuv2anyX = yuv2anyX; } } - - diff --git a/tests/extended.ffconcat b/tests/extended.ffconcat index c8afbcedb5..5d6d8f7908 100644 --- a/tests/extended.ffconcat +++ b/tests/extended.ffconcat @@ -111,4 +111,3 @@ outpoint 00:00.40 file %SRCFILE% inpoint 00:00.40 - diff --git a/tests/fate/ffprobe.mak b/tests/fate/ffprobe.mak index 23c6d3550d..f09e0ce3e8 100644 --- a/tests/fate/ffprobe.mak +++ b/tests/fate/ffprobe.mak @@ -25,4 +25,3 @@ FATE_FFPROBE-$(call FILTERDEMDECENCMUX, AEVALSRC TESTSRC ARESAMPLE, FFMETADATA, += $(FFPROBE_TEST_FILE_TESTS-yes) fate-ffprobe: $(FATE_FFPROBE-yes) - diff --git a/tests/fate/lossless-audio.mak b/tests/fate/lossless-audio.mak index 7c5af885b4..3d16aa8cae 100644 --- a/tests/fate/lossless-audio.mak +++ b/tests/fate/lossless-audio.mak @@ -36,4 +36,3 @@ FATE_SAMPLES_LOSSLESS_AUDIO += $(FATE_SAMPLES_LOSSLESS_AUDIO-yes) FATE_SAMPLES_FFMPEG += $(FATE_SAMPLES_LOSSLESS_AUDIO) fate-lossless-audio: $(FATE_SAMPLES_LOSSLESS_AUDIO) - diff --git a/tests/simple1.ffconcat b/tests/simple1.ffconcat index c9299e0faa..6dcadcbf78 100644 --- a/tests/simple1.ffconcat +++ b/tests/simple1.ffconcat @@ -9,4 +9,3 @@ file %SRCFILE% inpoint 00:00.20 outpoint 00:00.40 file_packet_meta dummy 1 - diff --git a/tests/simple2.ffconcat b/tests/simple2.ffconcat index d1c1ee0c4d..0cc3df2339 100644 --- a/tests/simple2.ffconcat +++ b/tests/simple2.ffconcat @@ -18,4 +18,3 @@ inpoint 00:02.20 file %SRCFILE% inpoint 00:01.80 outpoint 00:02.00 - _______________________________________________ ffmpeg-cvslog mailing list -- [email protected] To unsubscribe send an email to [email protected]
