ffmpeg

History

Michael Niedermayer fadf845973 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>

2013-02-06 14:25:28 +01:00

dsputil_align.c

Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'

2013-02-06 14:25:28 +01:00

dsputil_sh4.c

Merge commit '620289a20e022b9c16c10d546ef86cc0bb77cc84'

2013-02-06 13:27:24 +01:00

dsputil_sh4.h

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'

2013-01-23 17:44:56 +01:00

idct_sh4.c

Merge commit '88bd7fdc821aaa0cbcf44cf075c62aaa42121e3f'