Error: conflict in file ffmpeg-7.spec

Changes of Revision 2

ffmpeg-support-kid-key.patch Added