ffmpeg/libavformat
Michael Niedermayer 757473831c Merge remote-tracking branch 'qatar/master'
* qatar/master: (29 commits)
  cabac: Move code only used within the CABAC test program into the test program.
  vp56: Drop unnecessary cabac.h #include.
  h264-test: Initialize AVCodecContext.av_class.
  build: Skip compiling network.h and rtsp.h if networking is not enabled.
  cosmetics: drop some pointless parentheses
  Disable annoying warning without changing behavior
  faq: Solutions for common problems with sample paths when running FATE.
  avcodec: attempt to clarify the CODEC_CAP_DELAY documentation
  avcodec: fix avcodec_encode_audio() documentation.
  FATE: xmv-demux test; exercise the XMV demuxer without decoding the perceptual codecs inside.
  vqf: recognize more metadata chunks
  FATE test: BMV demuxer and associated video and audio decoders.
  FATE: indeo4 video decoder test.
  FATE: update xxan-wc4 test to a sample with more code coverage.
  Change the recent h264_mp4toannexb bitstream filter test to output to an elementary stream rather than a program stream.
  g722enc: validate AVCodecContext.trellis
  g722enc: set frame_size, and also handle an odd number of input samples
  g722enc: split encoding into separate functions for trellis vs. no trellis
  mpegaudiodec: Use clearer pointer math
  tta: Fix returned error code at EOF
  ...

Conflicts:
	libavcodec/h264.c
	libavcodec/indeo3.c
	libavcodec/interplayvideo.c
	libavcodec/ivi_common.c
	libavcodec/libxvidff.c
	libavcodec/mpegvideo.c
	libavcodec/ppc/mpegvideo_altivec.c
	libavcodec/tta.c
	libavcodec/utils.c
	libavfilter/vsrc_buffer.c
	libavformat/Makefile
	tests/fate/indeo.mak
	tests/ref/acodec/g722

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-08 03:34:22 +01:00
..
4xm.c
Makefile
a64.c
aacdec.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
ac3dec.c
act.c lavf: rename remaining av_set_pts_info() to avpriv_set_pts_info(). 2011-12-03 03:24:32 +01:00
adts.h
adtsenc.c
adxdec.c
aea.c
aiff.h
aiffdec.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
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 Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
asfcrypt.h
asfdec.c
asfenc.c
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +01:00
avc.h
avformat.h
avi.h
avidec.c
avienc.c
avio.c
avio.h Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
avio_internal.h
aviobuf.c
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bmv.c
c93.c
cache.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 Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c
dv.h
dvenc.c
dxa.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
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 Replace vendor string in Ogg and FLAC muxers. 2011-11-02 10:43:39 +01:00
flacenc.h
flacenc_header.c
flic.c
flv.h
flvdec.c
flvenc.c Merge remote-tracking branch 'qatar/master' 2011-12-16 01:23:15 +01:00
framecrcenc.c
g723_1.c
g729dec.c
gif.c
gopher.c
gsmdec.c
gxf.c
gxf.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
http.c
http.h Merge remote-tracking branch 'qatar/master' 2011-11-11 02:50:35 +01:00
httpauth.c
httpauth.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
icodec.c Microsoft Windows ICO demuxer 2011-12-04 16:44:20 +01:00
id3v1.c
id3v1.h
id3v2.c
id3v2.h
id3v2enc.c id3v2enc: av_strcasecmp() 2011-11-03 20:21:01 +01:00
idcin.c
idroqdec.c
idroqenc.c
iff.c
img2.c
ingenientdec.c
internal.h Merge remote-tracking branch 'qatar/master' 2011-12-22 01:51:53 +01:00
ipmovie.c Merge remote-tracking branch 'qatar/master' 2012-01-08 03:34:22 +01:00
isom.c
isom.h Merge remote-tracking branch 'qatar/master' 2011-10-29 02:08:54 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c
latmenc.c
libavformat.v
libmodplug.c
libnut.c
librtmp.c
lmlm4.c
loasdec.c
lxfdec.c
m4vdec.c
matroska.c
matroska.h
matroskadec.c
matroskaenc.c
md5enc.c
md5proto.c
metadata.c
metadata.h Merge remote-tracking branch 'qatar/master' 2011-06-09 04:47:19 +02:00
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
mmst.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
mov.c
mov_chan.c
mov_chan.h
movenc.c
movenc.h
movenchint.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
mp3dec.c
mp3enc.c
mpc.c
mpc8.c
mpeg.c
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-01-03 03:06:45 +01:00
mpegts.c mpegts: remove unused variable 2011-12-31 02:27:11 +01:00
mpegts.h
mpegtsenc.c
mpegvideodec.c
mpjpeg.c Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
msnwc_tcp.c
mtv.c
mvi.c
mxf.c
mxf.h
mxfdec.c
mxfenc.c
mxg.c
ncdec.c
network.c
network.h
nsvdec.c nsvdec: Check av_malloc(string_size) 2011-12-30 01:44:47 +01:00
nullenc.c
nut.c
nut.h
nutdec.c
nutenc.c
nuv.c
oggdec.c
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
oggparseflac.c
oggparseogm.c
oggparseskeleton.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oma.c
oma.h
omadec.c
omaenc.c
options.c
os_support.c
os_support.h
pcm.c
pcm.h
pcmdec.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
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 Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
rsoenc.c
rtmp.h
rtmppkt.c Merge remote-tracking branch 'qatar/master' 2011-12-12 01:25:37 +01:00
rtmppkt.h
rtmpproto.c
rtp.c
rtp.h
rtpdec.c
rtpdec.h Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
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 Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
rtpdec_xiph.c
rtpenc.c Merge remote-tracking branch 'qatar/master' 2011-12-02 00:51:11 +01:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
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 Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
rtpproto.c
rtsp.c
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sdp.c
seek-test.c
seek.c
seek.h Replace FFmpeg with Libav in licence headers 2011-03-19 13:33:20 +00:00
segafilm.c
segment.c
sierravmd.c
siff.c
smacker.c smackerdemuxer: check some values before instead of just after malloc() 2011-12-16 03:25:20 +01:00
smjpeg.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
spdifenc.c spdifenc: use special alignment for DTS-HD length_code 2012-01-05 16:27:07 -08:00
srtdec.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
swf.h
swfdec.c Merge remote-tracking branch 'qatar/master' 2011-12-01 02:54:24 +01:00
swfenc.c
tcp.c
thp.c
tiertexseq.c
tls.c avio: Add an URLProtocol flag for indicating that a protocol uses network 2012-01-05 23:56:52 +02:00
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 Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c Cosmetics: Improve 'too short LIST' error message in wav.c. 2011-12-14 15:11:10 +01:00
wc3movie.c
westwood.c txd/westwood: remove demuxer specific overallocate solutions as the new generic code 2011-12-16 16:58:20 +01:00
wtv.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.c