[SCM] libav/experimental: asf/wtv: use service_provider and service_name metadata tags

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 45430099438d7b4f70ebb23611a29d318ba49687
Author: Ronald S. Bultje <rsbultje at gmail.com>
Date:   Mon Jan 31 08:58:14 2011 -0500

    asf/wtv: use service_provider and service_name metadata tags
    
    Signed-off-by: Ronald S. Bultje <rsbultje at gmail.com>

diff --git a/libavformat/asf.c b/libavformat/asf.c
index e665992..1f6af18 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -153,6 +153,8 @@ const AVMetadataConv ff_asf_metadata_conv[] = {
     { "WM/Tool"            , "encoder"     },
     { "WM/TrackNumber"     , "track"       },
     { "WM/Track"           , "track"       },
+    { "WM/MediaStationCallSign", "service_provider" },
+    { "WM/MediaStationName", "service_name" },
 //  { "Year"               , "date"        }, TODO: conversion year<->date
     { 0 }
 };

-- 
Libav/FFmpeg packaging