Michael Niedermayer e13d5e9a4b Merge commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2' ...

* commit '5e9c6ef8f3beb9ed7b271654a82349ac90fe43f2':
  x86: h264_weight_10bit: port to cpuflags
  libtheoraenc: add missing pixdesc.h header
  avcodec: remove ff_is_hwaccel_pix_fmt
  pixdesc: add av_pix_fmt_get_chroma_sub_sample
  hlsenc: stand alone hls segmenter

Conflicts:
	doc/muxers.texi
	libavcodec/ffv1enc.c
	libavcodec/imgconvert.c
	libavcodec/mpegvideo_enc.c
	libavcodec/tiffenc.c
	libavformat/Makefile
	libavformat/allformats.c

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

2012-11-14 11:59:20 +01:00

..

ac3dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

ac3dsp.asm

Merge commit '9a07c1332cfe092b57b5758f22b686ca58806c60'

2012-11-03 14:13:45 +01:00

cabac.h

get_cabac_inline_x86: workaround clang bug with disabled optimizations

2012-09-18 00:45:29 +02:00

cavsdsp.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

dct32.asm

build: Drop AVX assembly ifdefs

2012-11-11 20:43:28 +01:00

deinterlace.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

diracdsp_mmx.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

diracdsp_mmx.h

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

diracdsp_yasm.asm

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

dnxhdenc.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

dsputil_avg_template.c

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

dsputil_mmx.c

Merge remote-tracking branch 'qatar/master'

2012-11-01 13:25:46 +01:00

dsputil_mmx.h

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

dsputil_qns_template.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

dsputil_rnd_template.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

dsputil.asm

build: Drop AVX assembly ifdefs

2012-11-11 20:43:28 +01:00

dsputilenc_mmx.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

dsputilenc.asm

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

dwt_yasm.asm

dwt_yasm/vertical_compose: fix width witdth argument.

2012-11-11 12:41:35 +01:00

dwt.c

…

dwt.h

…

fdct.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

fft_init.c

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

fft.asm

build: Drop AVX assembly ifdefs

2012-11-11 20:43:28 +01:00

fft.h

…

fmtconvert_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

fmtconvert.asm

Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

2012-11-03 14:24:11 +01:00

h264_chromamc_10bit.asm

build: Drop AVX assembly ifdefs

2012-11-11 20:43:28 +01:00

h264_chromamc.asm

Merge remote-tracking branch 'qatar/master'

2012-11-01 13:25:46 +01:00

h264_deblock_10bit.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264_deblock.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264_i386.h

…

h264_idct_10bit.asm

build: Drop AVX assembly ifdefs

2012-11-11 20:43:28 +01:00

h264_idct.asm

Merge commit 'be923ed659016350592acb9b3346f706f8170ac5'

2012-10-31 14:16:18 +01:00

h264_intrapred_10bit.asm

build: Drop AVX assembly ifdefs

2012-11-11 20:43:28 +01:00

h264_intrapred_init.c

Merge remote-tracking branch 'qatar/master'

2012-10-30 17:47:36 +01:00

h264_intrapred.asm

Merge remote-tracking branch 'qatar/master'

2012-11-10 12:44:39 +01:00

h264_qpel_10bit.asm

x86: h264_qpel_10bit: drop unused parameter from MC10/MC20/MC30 macros

2012-11-10 14:49:09 +01:00

h264_qpel.c

Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'

2012-11-05 22:36:05 +01:00

h264_weight_10bit.asm

x86: h264_weight_10bit: port to cpuflags

2012-11-13 19:07:09 +01:00

h264_weight.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

h264dsp_init.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

idct_mmx_xvid.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

idct_mmx.c

…

idct_sse2_xvid.c

…

idct_xvid.h

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

imdct36.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

lpc.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

mathops.h

…

mlpdsp.c

Merge remote-tracking branch 'qatar/master'

2012-10-11 15:55:41 +02:00

motion_est.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

mpegaudiodec.c

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

mpegvideo.c

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

mpegvideoenc_template.c

…

mpegvideoenc.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

pngdsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

pngdsp.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

proresdsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

proresdsp.asm

Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'

2012-10-31 13:57:09 +01:00

rv34dsp_init.c

x86: Replace checks for CPU extensions and flags by convenience macros

2012-09-08 18:18:34 +02:00

rv34dsp.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

rv40dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

rv40dsp.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

sbrdsp_init.c

x86: Replace checks for CPU extensions and flags by convenience macros

2012-09-08 18:18:34 +02:00

sbrdsp.asm

x86: yasm: Use complete source path for macro helper %includes

2012-10-31 00:37:42 +01:00

simple_idct.c

…

snowdsp.c

…

v210-init.c

…

v210.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

vc1dsp_init.c

x86: vc1dsp: port to cpuflags

2012-11-05 14:51:10 +01:00

vc1dsp_mmx.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

vc1dsp.asm

Merge commit '930e26a3ea9d223e04bac4cdde13697cec770031'

2012-11-05 22:36:05 +01:00

vc1dsp.h

Merge remote-tracking branch 'qatar/master'

2012-10-08 21:46:34 +02:00

vp3dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

vp3dsp.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

vp8dsp_init.c

…

vp8dsp.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

vp56_arith.h

…

vp56dsp_init.c

Merge remote-tracking branch 'qatar/master'

2012-09-09 13:27:42 +02:00

vp56dsp.asm

Merge commit '6860b4081d046558c44b1b42f22022ea341a2a73'

2012-10-31 13:43:33 +01:00

w64xmmtest.c

…