Merge remote-tracking branch 'qatar/master'

[ffmpeg] / libavformat / asf.c

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 1f6af18b29669b02ef3ec04f3699b113d6ea5d6f..8e360d3596bf64aaa4c341b185466f96b45757af 100644 (file)
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -152,7 +152,6 @@ const AVMetadataConv ff_asf_metadata_conv[] = {
     { "WM/Publisher"       , "publisher"   },
     { "WM/Tool"            , "encoder"     },
     { "WM/TrackNumber"     , "track"       },
-    { "WM/Track"           , "track"       },
     { "WM/MediaStationCallSign", "service_provider" },
     { "WM/MediaStationName", "service_name" },
 //  { "Year"               , "date"        }, TODO: conversion year<->date