ffmpeg/libavformat
Michael Niedermayer cd8cb54990 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  ARM: ac3dsp: optimised update_bap_counts()
  mpegaudiodec: Fix av_dlog() invocation.
  h264/10bit: add HAVE_ALIGNED_STACK checks.
  Update 8-bit H.264 IDCT function names to reflect bit-depth.
  Add IDCT functions for 10-bit H.264.
  mpegaudioenc: Fix broken av_dlog statement.
  Employ correct printf format specifiers, mostly in debug output.
  ARM: fix MUL64 inline asm for pre-armv6

Conflicts:
	libavcodec/mpegaudioenc.c
	libavformat/ape.c
	libavformat/mxfdec.c
	libavformat/r3d.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-06-02 05:12:10 +02:00
..
4xm.c
Makefile
a64.c
aacdec.c
ac3dec.c
adts.h
adtsenc.c
aea.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
applehttp.c
applehttpproto.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c
asfenc.c
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h
avi.c
avi.h
avidec.c
avienc.c
avio.c
avio.h
avio_internal.h
aviobuf.c
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c
c93.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
concat.c
crcenc.c
crypto.c
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
filmstripdec.c
filmstripenc.c
flacdec.c
flacenc.c
flacenc.h
flacenc_header.c
flic.c
flv.h
flvdec.c
flvenc.c
framecrcenc.c
gif.c
gopher.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
http.c
http.h
httpauth.c
httpauth.h
id3v1.c
id3v1.h
id3v2.c
id3v2.h
idcin.c
idroqdec.c
idroqenc.c
iff.c
img2.c
ingenientdec.c
internal.h
ipmovie.c
isom.c
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c
libavformat.v
libnut.c
librtmp.c
lmlm4.c
lxfdec.c
m4vdec.c
matroska.c
matroska.h
matroskadec.c
matroskaenc.c
md5enc.c
md5proto.c
metadata.c
metadata.h
microdvddec.c
microdvdenc.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov.c
movenc.c
movenc.h
movenchint.c
mp3dec.c
mp3enc.c
mpc.c
mpc8.c
mpeg.c
mpeg.h
mpegenc.c
mpegts.c
mpegts.h
mpegtsenc.c
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c
mtv.c
mvi.c
mxf.c
mxf.h
mxfdec.c
mxfenc.c
mxg.c
ncdec.c
network.h
nsvdec.c
nullenc.c
nut.c
nut.h
nutdec.c
nutenc.c
nuv.c
oggdec.c
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oma.c
options.c
os_support.c
os_support.h
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pmpdec.c
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c
rawdec.c
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c
rdt.h
riff.c
riff.h
rl2.c
rm.c
rm.h
rmdec.c
rmenc.c
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
rtmpproto.c
rtp.c
rtp.h
rtpdec.c
rtpdec.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_h263.c
rtpdec_h264.c
rtpdec_latm.c
rtpdec_mpeg4.c
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c
rtpenc.c
rtpenc.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h264.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpproto.c
rtsp.c
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sdp.c
seek.c
seek.h
segafilm.c
sierravmd.c
siff.c
smacker.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
swf.h
swfdec.c
swfenc.c
tcp.c
thp.c
tiertexseq.c
timefilter.c
timefilter.h
tmv.c
tta.c
tty.c
txd.c
udp.c
url.h
utils.c
vc1test.c
vc1testenc.c
version.h
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c
wc3movie.c
westwood.c
wtv.c
wtv.h
wtvdec.c
wv.c
xa.c
xwma.c
yop.c
yuv4mpeg.c