diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2025-03-14 15:09:21 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2025-03-17 15:26:10 +0100 |
| commit | efdf7512a584f87ff98fcce3449deffd9abae093 (patch) | |
| tree | 0834a012a90a80dc32480b17de5a9a2f8a1ae67f /libavcodec/ffv1_parse.c | |
| parent | 94beaf48723adb01d452fddaa99f384350ed5c41 (diff) | |
| download | ffmpeg-efdf7512a584f87ff98fcce3449deffd9abae093.tar.gz | |
gitattributes: End merge conflicts in Changelog
Similar could be done with other lists that generally are appended to
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/ffv1_parse.c')
0 files changed, 0 insertions, 0 deletions