[FFmpeg-cvslog] Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Feb  6 14:10:26 2013 +0100| [fadf845973aeb47d1b0bf3eac552394fd8a71437] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fadf845973aeb47d1b0bf3eac552394fd8a71437
---