Michael Niedermayer 1d9569f9e8 Merge remote-tracking branch 'qatar/master' ... * qatar/master: (23 commits) aacenc: Fix identification padding when the bitstream is already aligned. aacenc: Write correct length for long identification strings. aud: remove unneeded field, audio_stream_index from context aud: fix time stamp calculation for ADPCM IMA WS aud: simplify header parsing aud: set pts_wrap_bits to 64. cosmetics: indentation aud: support Westwood SND1 audio in AUD files. adpcm_ima_ws: fix stereo decoding avcodec: add a new codec_id for CRYO APC IMA ADPCM. vqa: remove unused context fields, audio_samplerate and audio_bits vqa: clean up audio header parsing vqa: set time base to frame rate as coded in the header. vqa: set packet duration. vqa: use 1/sample_rate as the audio stream time base vqa: set stream start_time to 0. lavc: postpone the removal of AVCodecContext.request_channels. lavf: postpone removing av_close_input_file(). lavc: postpone removing old audio encoding and decoding API avplay: remove the -er option. ... Conflicts: Changelog libavcodec/version.h libavdevice/v4l.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-24 22:53:59 +01:00
..
alpha
arm	Merge remote-tracking branch 'qatar/master'	2012-01-21 01:33:31 +01:00
avr32
bfin
mips
mlib
ppc
ps2
sh4
sparc
x86
4xm.c
8bps.c
8svx.c
a64colors.h
a64enc.h
a64multienc.c
a64tables.h
aac_ac3_parser.c
aac_ac3_parser.h
aac_adtstoasc_bsf.c
aac_parser.c
aac_tablegen_decl.h
aac_tablegen.c
aac_tablegen.h
aac.h
aacadtsdec.c
aacadtsdec.h
aaccoder.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 02:41:53 +01:00
aacdec.c
aacdectab.h
aacenc.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 22:53:59 +01:00
aacenc.h	Merge remote-tracking branch 'qatar/master'	2012-01-24 02:41:53 +01:00
aacps_tablegen.c
aacps_tablegen.h
aacps.c
aacps.h
aacpsdata.c
aacpsy.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 02:41:53 +01:00
aacpsy.h
aacsbr.c
aacsbr.h
aacsbrdata.h
aactab.c
aactab.h
aandcttab.c
aandcttab.h
aasc.c
ac3_parser.c	ac3dec: Move center&surround mix level tables to parser.	2012-01-21 05:29:47 +01:00
ac3_parser.h
ac3.c
ac3.h
ac3dec_data.c
ac3dec_data.h
ac3dec.c	ac3dec: Move center&surround mix level tables to parser.	2012-01-21 05:29:47 +01:00
ac3dec.h
ac3dsp.c
ac3dsp.h
ac3enc_fixed.c
ac3enc_float.c
ac3enc_opts_template.c
ac3enc_template.c
ac3enc.c
ac3enc.h
ac3tab.c
ac3tab.h
acelp_filters.c
acelp_filters.h
acelp_pitch_delay.c
acelp_pitch_delay.h
acelp_vectors.c
acelp_vectors.h
adpcm_data.c
adpcm_data.h
adpcm.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 22:53:59 +01:00
adpcm.h
adpcmenc.c
adx_parser.c
adx.c
adx.h
adxdec.c
adxenc.c
alac.c
alacenc.c
allcodecs.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 22:53:59 +01:00
alsdec.c
amr.h
amrnbdata.h
amrnbdec.c
amrwbdata.h
amrwbdec.c
anm.c
ansi.c
apedec.c
ass_split.c
ass_split.h
ass.c
ass.h
assdec.c
assenc.c
asv1.c
atrac1.c
atrac1data.h
atrac3.c
atrac3data.h
atrac.c
atrac.h
audioconvert.c
audioconvert.h
aura.c
avcodec.h	Merge remote-tracking branch 'qatar/master'	2012-01-24 22:53:59 +01:00
avfft.c
avfft.h
avpacket.c
avs.c
bethsoftvideo.c
bethsoftvideo.h
bfi.c
bgmc.c
bgmc.h
bink.c
binkaudio.c
binkdata.h
binkdsp.c
binkdsp.h
bintext.c
bintext.h
bit_depth_template.c
bitstream_filter.c
bitstream.c
bmp.c
bmp.h
bmpenc.c
bmv.c
bytestream.h
c93.c
cabac_functions.h
cabac.c
cabac.h
cavs_parser.c
cavs.c
cavs.h
cavsdata.h
cavsdec.c
cavsdsp.c
cavsdsp.h
cbrt_tablegen.c
cbrt_tablegen.h
cdgraphics.c
celp_filters.c
celp_filters.h
celp_math.c
celp_math.h
cga_data.c
cga_data.h
chomp_bsf.c
cinepak.c
cljr.c
codec_names.sh
cook.c
cookdata.h
cos_tablegen.c
crystalhd.c	CrystalHD: Back up extradata to allow decoder reinit to work.	2012-01-22 23:40:24 +01:00
cscd.c
cyuv.c
dca_parser.c
dca.c
dca.h
dcadata.h
dcadsp.c
dcadsp.h
dcaenc.c
dcaenc.h
dcahuff.h
dct32_fixed.c
dct32_float.c
dct32.c
dct32.h
dct-test.c
dct.c
dct.h
dctref.c
dctref.h
dfa.c
dirac_arith.c
dirac_arith.h
dirac_parser.c
dirac.c
dirac.h
diracdec.c
diracdsp.c
diracdsp.h
dnxhd_parser.c
dnxhddata.c
dnxhddata.h
dnxhddec.c	DNxHD: frame multithreading	2012-01-19 17:12:43 +01:00
dnxhdenc.c
dnxhdenc.h
dpcm.c
dpx.c
dpxenc.c
dsicinav.c
dsputil_template.c
dsputil.c
dsputil.h
dump_extradata_bsf.c
dv_tablegen.c
dv_tablegen.h
dv_vlc_data.h
dv.c
dvbsub_parser.c
dvbsub.c
dvbsubdec.c
dvdata.c
dvdata.h
dvdsub_parser.c
dvdsubdec.c
dvdsubenc.c
dwt.c
dwt.h
dxa.c
dxtory.c
dxva2_h264.c
dxva2_internal.h
dxva2_mpeg2.c
dxva2_vc1.c
dxva2.c
dxva2.h
eac3_data.c
eac3_data.h
eac3dec.c
eac3enc.c
eac3enc.h
eacmv.c
eaidct.c
eamad.c
eatgq.c
eatgv.c
eatqi.c
elbg.c
elbg.h
error_resilience.c	error concealment: initialize block index.	2012-01-24 21:08:41 +01:00
escape124.c
escape130.c
faandct.c
faandct.h
faanidct.c
faanidct.h
faxcompr.c
faxcompr.h
fft_fixed.c
fft_float.c
fft-fixed-test.c
fft-internal.h
fft-test.c
fft.c
fft.h
ffv1.c
ffwavesynth.c
flac_parser.c
flac.c
flac.h
flacdata.c
flacdata.h
flacdec.c
flacenc.c
flashsv2enc.c
flashsv.c
flashsvenc.c
flicvideo.c
flv.h
flvdec.c
flvenc.c
fmtconvert.c
fmtconvert.h
fraps.c	Extract some duplicated code.	2012-01-22 14:41:15 +01:00
frwu.c
g722.c
g722.h
g722dec.c
g722enc.c
g723_1_data.h
g723_1.c
g726.c
g729.h
g729data.h
g729dec.c
g729postfilter.c
g729postfilter.h
get_bits.h
gif.c
gifdec.c
golomb.c
golomb.h
gsm_parser.c
gsm.h
gsmdec_data.c
gsmdec_data.h
gsmdec_template.c
gsmdec.c
h261_parser.c
h261.c
h261.h
h261data.h
h261dec.c
h261enc.c
h263_parser.c
h263_parser.h
h263.c
h263.h
h263data.h
h263dec.c
h264_cabac.c
h264_cavlc.c
h264_direct.c
h264_loopfilter.c
h264_mp4toannexb_bsf.c
h264_mvpred.h
h264_parser.c
h264_ps.c
h264_refs.c
h264_sei.c
h264.c	h264: Disallow w/h/pixfmt changes for frame threads.	2012-01-24 15:36:38 +01:00
h264.h
h264data.h
h264dsp_template.c
h264dsp.c
h264dsp.h
h264idct_template.c
h264idct.c
h264pred_template.c
h264pred.c
h264pred.h
huffman.c
huffman.h
huffyuv.c
idcinvideo.c
iff.c
iirfilter.c
iirfilter.h
imc.c
imcdata.h
imgconvert.c	lavc: fix FF_LOSS_COLORQUANT detection for gray8a->pal8	2012-01-22 14:42:53 +01:00
imgconvert.h
imx_dump_header_bsf.c
indeo2.c
indeo2data.h
indeo3.c
indeo3data.h
indeo4.c
indeo4data.h
indeo5.c
indeo5data.h
intelh263dec.c
internal.h
interplayvideo.c
intrax8.c
intrax8.h
intrax8dsp.c
intrax8huf.h
inverse.c
ituh263dec.c
ituh263enc.c
ivi_common.c
ivi_common.h
ivi_dsp.c
ivi_dsp.h
j2k_dwt.c
j2k_dwt.h
j2k.c
j2k.h
j2kdec.c
j2kenc.c
jfdctfst.c
jfdctint_template.c
jfdctint.c
jpegls.c
jpegls.h
jpeglsdec.c
jpeglsdec.h
jpeglsenc.c
jrevdct.c
jvdec.c
kbdwin.c
kbdwin.h
kgv1dec.c
kmvc.c
lagarith.c
lagarithrac.c
lagarithrac.h
latm_parser.c
lcl.h
lcldec.c
lclenc.c
libaacplus.c
libavcodec.v
libcelt_dec.c
libdirac_libschro.c
libdirac_libschro.h
libdirac.h
libdiracdec.c
libdiracenc.c
libfaac.c	Revert "Fix multi-channel AAC encoding."	2012-01-24 02:31:56 +01:00
libgsm.c
libmp3lame.c
libopencore-amr.c
libopenjpegdec.c
libopenjpegenc.c	Changed indexing in libopenjpeg to shorten lines	2012-01-19 23:31:22 +01:00
libschroedinger.c
libschroedinger.h
libschroedingerdec.c
libschroedingerenc.c
libspeexdec.c
libspeexenc.c
libstagefright.cpp
libtheoraenc.c
libutvideo.cpp
libvo-aacenc.c
libvo-amrwbenc.c
libvorbis.c
libvpxdec.c
libvpxenc.c
libx264.c
libxavs.c
libxvid_internal.h
libxvid_rc.c
libxvidff.c
ljpegenc.c
loco.c
lpc.c
lpc.h
lsp.c
lsp.h
lzw.c
lzw.h
lzwenc.c
mace.c
Makefile	Merge remote-tracking branch 'qatar/master'	2012-01-24 22:53:59 +01:00
mathops.h
mdct_fixed.c
mdct_float.c
mdct.c
mdec.c
mimic.c	Use av_fast_padded_malloc in mimic and truemotion2 decoders.	2012-01-18 22:04:14 +01:00
mjpeg2jpeg_bsf.c
mjpeg_parser.c
mjpeg.c
mjpeg.h
mjpega_dump_header_bsf.c
mjpegbdec.c
mjpegdec.c
mjpegdec.h
mjpegenc.c
mjpegenc.h
mlp_parser.c
mlp_parser.h
mlp.c
mlp.h
mlpdec.c
mlpdsp.c
mmvideo.c
motion_est_template.c
motion_est.c
motion-test.c
motionpixels_tablegen.c
motionpixels_tablegen.h
motionpixels.c
movsub_bsf.c
mp3_header_compress_bsf.c
mp3_header_decompress_bsf.c
mpc7.c	Use av_fast_padded_malloc in fraps and mpc decoders.	2012-01-18 21:22:01 +01:00
mpc7data.h
mpc8.c
mpc8data.h
mpc8huff.h
mpc.c
mpc.h	Use av_fast_padded_malloc in fraps and mpc decoders.	2012-01-18 21:22:01 +01:00
mpcdata.h
mpeg4audio.c
mpeg4audio.h
mpeg4data.h
mpeg4video_parser.c
mpeg4video_parser.h
mpeg4video.c
mpeg4video.h
mpeg4videodec.c
mpeg4videoenc.c
mpeg12.c	mpeg12: fixed parsing in some mpeg2 streams	2012-01-22 14:42:53 +01:00
mpeg12.h
mpeg12data.c
mpeg12data.h
mpeg12decdata.h
mpeg12enc.c
mpegaudio_parser.c
mpegaudio_tablegen.c
mpegaudio_tablegen.h
mpegaudio.c
mpegaudio.h
mpegaudiodata.c
mpegaudiodata.h
mpegaudiodec_float.c
mpegaudiodec.c	Merge remote-tracking branch 'qatar/master'	2012-01-21 23:11:27 +01:00
mpegaudiodecheader.c
mpegaudiodecheader.h
mpegaudiodectab.h
mpegaudiodsp_fixed.c
mpegaudiodsp_float.c
mpegaudiodsp_template.c
mpegaudiodsp.c
mpegaudiodsp.h
mpegaudioenc.c
mpegaudiotab.h
mpegvideo_common.h	Merge remote-tracking branch 'qatar/master'	2012-01-21 23:11:27 +01:00
mpegvideo_enc.c
mpegvideo_parser.c
mpegvideo_xvmc.c
mpegvideo.c	mpegvideo: Draw edges based on the pictures linesize instead of the contexts.	2012-01-24 15:36:38 +01:00
mpegvideo.h
mqc.c
mqc.h
mqcdec.c
mqcenc.c
msgsmdec.c
msgsmdec.h
msmpeg4.c
msmpeg4.h
msmpeg4data.c
msmpeg4data.h
msrle.c
msrledec.c
msrledec.h
msvideo1.c
msvideo1enc.c
mxpegdec.c
nellymoser.c
nellymoser.h
nellymoserdec.c
nellymoserenc.c
noise_bsf.c
nuv.c
opt.h
options.c	lavc: Mark the err_detect constants as audio+video as they also apply to audio.	2012-01-21 23:48:50 +01:00
os2threads.h
pamenc.c	pam: Fix a typo that broke writing and reading PAM files.	2012-01-22 16:38:20 +01:00
parser.c
parser.h
pcm_tablegen.c
pcm_tablegen.h
pcm-mpeg.c
pcm.c
pcx.c
pcxenc.c
pgssubdec.c	Improve support for PGS subtitles.	2012-01-23 19:47:49 +01:00
pictordec.c
png.c	pngdec: Fix masks for interlaced decoding	2012-01-22 00:46:19 +01:00
png.h
pngdec.c	pngdec: Do not use SIMD paeth prediction for bpp=2	2012-01-22 00:46:19 +01:00
pngenc.c
pnm_parser.c
pnm.c	Merge remote-tracking branch 'qatar/master'	2012-01-23 01:05:20 +01:00
pnm.h
pnmdec.c	Simplify 32bit pam decoding.	2012-01-19 23:31:21 +01:00
pnmenc.c
proresdec2.c
proresdec_lgpl.c
proresdec.h
proresdsp.c
proresdsp.h
proresenc.c
psymodel.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 02:41:53 +01:00
psymodel.h	Merge remote-tracking branch 'qatar/master'	2012-01-24 02:41:53 +01:00
pthread.c	pthreads: Generic progress lubrication support.	2012-01-23 19:47:49 +01:00
ptx.c
put_bits.h
qcelpdata.h
qcelpdec.c
qdm2_tablegen.c
qdm2_tablegen.h
qdm2.c
qdm2data.h
qdrw.c
qpeg.c
qtrle.c
qtrleenc.c
r210dec.c
ra144.c
ra144.h
ra144dec.c
ra144enc.c
ra288.c
ra288.h
rangecoder.c
rangecoder.h
ratecontrol.c	RC: Fix initial buffer occupancy.	2012-01-22 06:46:24 +01:00
ratecontrol.h
raw.c
raw.h
rawdec.c
rawenc.c
rdft.c
rdft.h
rectangle.h
remove_extradata_bsf.c
resample2.c
resample.c
rl2.c
rl.h
rle.c
rle.h
roqaudioenc.c
roqvideo.c
roqvideo.h
roqvideodec.c
roqvideoenc.c
rpza.c
rtjpeg.c
rtjpeg.h
rv10.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 22:53:59 +01:00
rv10enc.c
rv20enc.c
rv30.c
rv30data.h
rv30dsp.c
rv34_parser.c
rv34.c
rv34.h
rv34data.h
rv34dsp.c
rv34dsp.h
rv34vlc.h
rv40.c
rv40data.h
rv40dsp.c
rv40vlc2.h
s3tc.c
s3tc.h
s302m.c
sbr.h
sgi.h
sgidec.c
sgienc.c	Support encoding 16bit pixel formats to sgi.	2012-01-19 23:31:22 +01:00
shorten.c
simple_idct_template.c
simple_idct.c
simple_idct.h
sinewin_tablegen.c
sinewin_tablegen.h
sinewin.c
sinewin.h
sipr16k.c
sipr16kdata.h
sipr.c
sipr.h
siprdata.h
smacker.c
smc.c
snow.c
snow.h
snowdata.h
snowdec.c
snowenc.c
sonic.c
sp5x.h
sp5xdec.c
srtdec.c
srtenc.c
sunrast.c
svq1_cb.h
svq1_vlc.h
svq1.c
svq1.h
svq1dec.c
svq1enc_cb.h
svq1enc.c
svq3.c
synth_filter.c
synth_filter.h
tableprint.h
targa.c	Simplify PIX_FMT_RGB555LE selection in targa decoder.	2012-01-19 23:31:21 +01:00
targa.h
targaenc.c
thread.h
tiertexseqv.c
tiff.c	Support decoding gray8a tiff images.	2012-01-22 04:49:46 +01:00
tiff.h
tiffenc.c
timecode.c
timecode.h
tmv.c
truemotion1.c
truemotion1data.h
truemotion2.c	Use av_fast_padded_malloc in mimic and truemotion2 decoders.	2012-01-18 22:04:14 +01:00
truespeech_data.h
truespeech.c
tscc.c
tta.c
twinvq_data.h
twinvq.c
txd.c
ulti_cb.h
ulti.c
unary.h
utils.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 22:53:59 +01:00
utvideo.c
v210dec.c
v210dec.h
v210enc.c
v210x.c
v308dec.c
v308enc.c
v410dec.c
v410enc.c
vaapi_h264.c
vaapi_internal.h
vaapi_mpeg2.c
vaapi_mpeg4.c
vaapi_vc1.c
vaapi.c
vaapi.h
vb.c
vble.c
vc1_parser.c
vc1.c	Merge remote-tracking branch 'qatar/master'	2012-01-24 02:41:53 +01:00
vc1.h
vc1acdata.h
vc1data.c
vc1data.h
vc1dec.c
vc1dsp.c
vc1dsp.h
vcr1.c
vda_h264.c
vda_internal.h
vda.c
vda.h
vdpau_internal.h
vdpau.c
vdpau.h
version.h	Merge remote-tracking branch 'qatar/master'	2012-01-24 22:53:59 +01:00
vmdav.c
vmnc.c
vorbis_data.c
vorbis_enc_data.h
vorbis.c
vorbis.h
vorbisdec.c
vorbisenc.c
vp3_parser.c
vp3.c
vp3data.h
vp3dsp.c
vp5.c
vp5data.h
vp6.c
vp6data.h
vp6dsp.c
vp8_parser.c
vp8.c
vp8.h
vp8data.h
vp8dsp.c
vp8dsp.h
vp56.c
vp56.h
vp56data.c
vp56data.h
vp56dsp.c
vp56dsp.h
vp56rac.c
vqavideo.c
w32pthreads.h
wavpack.c
wma.c
wma.h
wmadata.h
wmadec.c
wmaenc.c
wmalosslessdec.c	wmalossless: Fix incompatoble pointer type warnings	2012-01-19 08:51:56 +01:00
wmaprodata.h
wmaprodec.c
wmavoice_data.h
wmavoice.c
wmv2.c
wmv2.h
wmv2dec.c
wmv2enc.c
wnv1.c
ws-snd1.c
xan.c
xiph.c
xiph.h
xl.c
xsubdec.c
xsubenc.c
xvmc_internal.h
xvmc.h
xwd.h	XWD encoder and decoder	2012-01-23 19:04:35 +01:00
xwddec.c	XWD encoder and decoder	2012-01-23 19:04:35 +01:00
xwdenc.c	XWD encoder and decoder	2012-01-23 19:04:35 +01:00
xxan.c
y41pdec.c
y41penc.c
yop.c
yuv4dec.c
yuv4enc.c
zmbv.c
zmbvenc.c