Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'

* commit '48a4ffa722c0874b251de9d201babed52cef0bcb':
  asf: K&R formatting cosmetics
  vc1dec: use codec_id instead of codec_tag for VC1IMAGE
  sh4: drop unused functions

Conflicts:
	libavformat/asf.c
	libavformat/asfdec.c
	libavformat/asfenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

1 files changed, 23 insertions, 24 deletions

diff --git a/libavformat/asf.c b/libavformat/asf.c
index 8e360d3596..d92fbd66e0 100644
--- a/libavformat/asf.c
+++ b/libavformat/asf.c
@@ -20,7 +20,6 @@
 
 #include "asf.h"
 
-
 const ff_asf_guid ff_asf_header = {
     0x30, 0x26, 0xB2, 0x75, 0x8E, 0x66, 0xCF, 0x11, 0xA6, 0xD9, 0x00, 0xAA, 0x00, 0x62, 0xCE, 0x6C
 };
@@ -48,7 +47,7 @@ const ff_asf_guid ff_asf_audio_conceal_none = {
 };
 
 const ff_asf_guid ff_asf_audio_conceal_spread = {
-     0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20
+    0x50, 0xCD, 0xC3, 0xBF, 0x8F, 0x61, 0xCF, 0x11, 0x8B, 0xB2, 0x00, 0xAA, 0x00, 0xB4, 0xE2, 0x20
 };
 
 const ff_asf_guid ff_asf_video_stream = {
@@ -91,31 +90,31 @@ const ff_asf_guid ff_asf_head2_guid = {
 };
 
 const ff_asf_guid ff_asf_extended_content_header = {
-        0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50
+    0x40, 0xA4, 0xD0, 0xD2, 0x07, 0xE3, 0xD2, 0x11, 0x97, 0xF0, 0x00, 0xA0, 0xC9, 0x5E, 0xA8, 0x50
 };
 
 const ff_asf_guid ff_asf_simple_index_header = {
-        0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB
+    0x90, 0x08, 0x00, 0x33, 0xB1, 0xE5, 0xCF, 0x11, 0x89, 0xF4, 0x00, 0xA0, 0xC9, 0x03, 0x49, 0xCB
 };
 
 const ff_asf_guid ff_asf_ext_stream_embed_stream_header = {
-        0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43
+    0xe2, 0x65, 0xfb, 0x3a, 0xEF, 0x47, 0xF2, 0x40, 0xac, 0x2c, 0x70, 0xa9, 0x0d, 0x71, 0xd3, 0x43
 };
 
 const ff_asf_guid ff_asf_ext_stream_audio_stream = {
-        0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03
+    0x9d, 0x8c, 0x17, 0x31, 0xE1, 0x03, 0x28, 0x45, 0xb5, 0x82, 0x3d, 0xf9, 0xdb, 0x22, 0xf5, 0x03
 };
 
 const ff_asf_guid ff_asf_metadata_header = {
-        0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca
+    0xea, 0xcb, 0xf8, 0xc5, 0xaf, 0x5b, 0x77, 0x48, 0x84, 0x67, 0xaa, 0x8c, 0x44, 0xfa, 0x4c, 0xca
 };
 
 const ff_asf_guid ff_asf_marker_header = {
-        0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65
+    0x01, 0xCD, 0x87, 0xF4, 0x51, 0xA9, 0xCF, 0x11, 0x8E, 0xE6, 0x00, 0xC0, 0x0C, 0x20, 0x53, 0x65
 };
 
 /* I am not a number !!! This GUID is the one found on the PC used to
-   generate the stream */
+ * generate the stream */
 const ff_asf_guid ff_asf_my_guid = {
     0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0
 };
@@ -138,22 +137,22 @@ const ff_asf_guid ff_asf_digital_signature = {
 
 /* List of official tags at http://msdn.microsoft.com/en-us/library/dd743066(VS.85).aspx */
 const AVMetadataConv ff_asf_metadata_conv[] = {
-    { "WM/AlbumArtist"     , "album_artist"},
-    { "WM/AlbumTitle"      , "album"       },
-    { "Author"             , "artist"      },
-    { "Description"        , "comment"     },
-    { "WM/Composer"        , "composer"    },
-    { "WM/EncodedBy"       , "encoded_by"  },
-    { "WM/EncodingSettings", "encoder"     },
-    { "WM/Genre"           , "genre"       },
-    { "WM/Language"        , "language"    },
-    { "WM/OriginalFilename", "filename"    },
-    { "WM/PartOfSet"       , "disc"        },
-    { "WM/Publisher"       , "publisher"   },
-    { "WM/Tool"            , "encoder"     },
-    { "WM/TrackNumber"     , "track"       },
+    { "WM/AlbumArtist",          "album_artist"     },
+    { "WM/AlbumTitle",           "album"            },
+    { "Author",                  "artist"           },
+    { "Description",             "comment"          },
+    { "WM/Composer",             "composer"         },
+    { "WM/EncodedBy",            "encoded_by"       },
+    { "WM/EncodingSettings",     "encoder"          },
+    { "WM/Genre",                "genre"            },
+    { "WM/Language",             "language"         },
+    { "WM/OriginalFilename",     "filename"         },
+    { "WM/PartOfSet",            "disc"             },
+    { "WM/Publisher",            "publisher"        },
+    { "WM/Tool",                 "encoder"          },
+    { "WM/TrackNumber",          "track"            },
     { "WM/MediaStationCallSign", "service_provider" },
-    { "WM/MediaStationName", "service_name" },
+    { "WM/MediaStationName",     "service_name"     },
 //  { "Year"               , "date"        }, TODO: conversion year<->date
     { 0 }
 };