Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 37 additions & 1 deletion .gitattributes
Original file line number Diff line number Diff line change
@@ -1,2 +1,38 @@
*.pnm -diff -text
Changelog merge=union
Changelog merge=union
tests/ref/fate/sub-aqtitle eol=lf
tests/ref/fate/sub-ass-to-ass-transcode eol=lf
tests/ref/fate/sub-cc eol=lf
tests/ref/fate/sub-cc-realtime
tests/ref/fate/sub-cc-realtime eol=lf
tests/ref/fate/sub-cc-scte20 eol=lf
tests/ref/fate/sub-charenc eol=lf
tests/ref/fate/sub-dvb eol=lf
tests/ref/fate/sub-jacosub eol=lf
tests/ref/fate/sub-lrc-remux eol=lf
tests/ref/fate/sub-microdvd eol=lf
tests/ref/fate/sub-microdvd-remux eol=lf
tests/ref/fate/sub-movtext eol=lf
tests/ref/fate/sub-mpl2 eol=lf
tests/ref/fate/sub-mpsub eol=lf
tests/ref/fate/sub-mpsub-frames eol=lf
tests/ref/fate/sub-pgs-remux eol=lf
tests/ref/fate/sub-pjs eol=lf
tests/ref/fate/sub-realtext eol=lf
tests/ref/fate/sub-sami eol=lf
tests/ref/fate/sub-sami2 eol=lf
tests/ref/fate/sub-scc-remux eol=lf
tests/ref/fate/sub-srt eol=lf
tests/ref/fate/sub-srt-badsyntax eol=lf
tests/ref/fate/sub-srt-empty-events eol=lf
tests/ref/fate/sub-srt-madness-timeshift eol=lf
tests/ref/fate/sub-srt-rrn-remux eol=lf
tests/ref/fate/sub-ssa-to-ass-remux eol=lf
tests/ref/fate/sub-stl eol=lf
tests/ref/fate/sub-subviewer eol=lf
tests/ref/fate/sub-subviewer1 eol=lf
tests/ref/fate/sub-ttmlenc eol=lf
tests/ref/fate/sub-vplayer eol=lf
tests/ref/fate/sub-webvtt eol=lf
tests/ref/fate/sub-webvtt2 eol=lf
tests/ref/fate/sub-webvttenc eol=lf
2 changes: 1 addition & 1 deletion tests/fate/hevc.mak
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ $(TARGET_SAMPLES)/hevc-conformance/LS_A_Orange_2.bit|$\
$(TARGET_SAMPLES)/hevc/mv_nuh_layer_id.bit|$\
$(TARGET_SAMPLES)/hevc-conformance/NoOutPrior_B_Qualcomm_1.bit|$\
$(TARGET_SAMPLES)/hevc-conformance/MVHEVCS_A.bit
fate-hevc-mv-switch: CMD = framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
fate-hevc-mv-switch: CMD = MSYS2_ARG_CONV_EXCL=concat: framecrc -i "concat:$(INPUT)" -fps_mode passthrough -map 0:vidx:0 -map 0:vidx:1 -sws_flags +accurate_rnd+bitexact
FATE_HEVC-$(call FRAMECRC, HEVC, HEVC, SCALE_FILTER CONCAT_PROTOCOL) += fate-hevc-mv-switch

# multiview stream, select view by position
Expand Down
2 changes: 1 addition & 1 deletion tests/fate/source-check.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ for f in `git ls-files | grep '\.h$'` ; do
-e 's/_vaf_/_/' \
| tr abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ`"

git grep -L "^#define $macro$" $f
git grep -L "^#define $macro\>" $f
done

echo "Use of av_clip() where av_clip_uintp2() could be used:"
Expand Down