Merge pull request #6818 from neheb/patch-31
authorTed Hess <thess@kitschensync.net>
Wed, 22 Aug 2018 19:57:56 +0000 (15:57 -0400)
committerGitHub <noreply@github.com>
Wed, 22 Aug 2018 19:57:56 +0000 (15:57 -0400)
commit39b064f8904fb56a9b7462708c2c1a450d198efc
tree7f2c5f249a2b6fa7b286914bb4b14ee42e5af7bd
parentd67647f64f16461fb3638ed5a5326eaccb5e01cc
parent683d8331503e171c04fb51e9f9d5fd5ff95eadbb
Merge pull request #6818 from neheb/patch-31

ffmpeg: Add CPE ID for proper CVE tracking