Michael Niedermayer c607a2cc97 Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  sparc: Eliminate dead code in VIS acceleration macros
  flacdec: drop unnecessary assert
  mjpegdec: properly report unsupported disabled features

Conflicts:
	libavcodec/flacdec.c
	libavcodec/mjpegdec.c

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

2013-05-16 17:10:51 +02:00

..

dsputil_vis.c

Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'

2013-04-20 15:11:06 +02:00

dsputil_vis.h

…

hpeldsp_vis.c

Merge commit '78ce568e43a7f3993c33100aa8f5d56c4c4bd493'

2013-04-20 15:11:06 +02:00

Makefile

…

simple_idct_vis.c

…

vis.h

Merge remote-tracking branch 'qatar/master'

2013-05-16 17:10:51 +02:00