1
0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-02-28 17:51:05 +00:00
ffmpeg/libavformat
Michael Niedermayer 8e31dbc1dc Merge remote-tracking branch 'qatar/master'
* qatar/master:
  Fix a bunch of common typos.
  build: Skip compiling xvmc.h under the correct condition.
  configure: darwin: Change dylib install names to include major version.
  mpegts: Always honor a registration descriptor if present and there is no other codec information.
  aacdec: Fix SCE parity check.
  aacdec: Fix out of array writes (stack).
  rtsp: Only set the ttl parameter if the server actually gave a value
  udp: Set ttl for read-write streams, too, not only for write-only ones
  udp: Only bind to the multicast address if in read-only mode
  udp: Clarify the comment about binding the multicast address
  udp: Reorder comments

Conflicts:
	libavcodec/aacdec.c
	tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-10 01:12:08 +01:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adts.h
adtsenc.c
adxdec.c
aea.c
aiff.h
aiffdec.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
aiffenc.c
allformats.c bluray protocol 2012-03-03 04:30:49 +01:00
amr.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
anm.c
apc.c
ape.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
apetag.c
apetag.h
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
asfenc.c
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
avi.h
avidec.c
avienc.c
avio_internal.h
avio.c
avio.h
aviobuf.c
avisynth.c
avlanguage.c
avlanguage.h
avs.c Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bluray.c bluray protocol 2012-03-03 04:30:49 +01:00
bmv.c
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c cdxl demux: do not create packets with uninitialized data at EOF. 2012-03-05 16:27:31 -05:00
concat.c
crcenc.c
crypto.c
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
dv.h
dvenc.c
dxa.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
eacdata.c
electronicarts.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
ffmenc.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
filmstripdec.c
filmstripenc.c
flacdec.c
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2012-02-28 03:38:58 +01:00
flvenc.c
framecrcenc.c
framehash.c
g723_1.c
g729dec.c
gif.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hls.c
hlsproto.c
http.c
http.h
httpauth.c
httpauth.h
icodec.c
id3v1.c
id3v1.h
id3v2.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
id3v2.h Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
id3v2enc.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
idcin.c
idroqdec.c
idroqenc.c
iff.c iff: add support for IFF DEEP 2012-03-09 01:55:45 +01:00
img2.c
img2dec.c
img2enc.c
ingenientdec.c
internal.h Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
ipmovie.c
isom.c
isom.h
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
Makefile bluray protocol 2012-03-03 04:30:49 +01:00
matroska.c
matroska.h Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
matroskadec.c matroska : Add support for reading/writing creation_time metadata. 2012-03-05 19:02:48 +01:00
matroskaenc.c matroska : Add support for reading/writing creation_time metadata. 2012-03-05 19:02:48 +01:00
md5enc.c
md5proto.c
metadata.c
metadata.h
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c
mov_chan.h doxygen: Remove documentation for non-existing parameters; misc small fixes. 2012-02-28 20:48:43 +01:00
mov.c mov: Discard invalid CTTS. 2012-03-08 21:31:45 +01:00
movenc.c Merge remote-tracking branch 'qatar/master' 2012-02-28 03:38:58 +01:00
movenc.h
movenchint.c
mp3dec.c mp3dec: Fix reading file size and frames in VBRI headers 2012-03-01 15:32:28 -08:00
mp3enc.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
mpc8.c
mpc.c
mpeg.c
mpeg.h
mpegenc.c
mpegts.c Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
mpegts.h Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
mpegtsenc.c
mpegvideodec.c mpegvideo_probe: Fix misdetection of mpeg4video files. 2012-03-09 22:25:32 +01:00
mpjpeg.c
msnwc_tcp.c
mtv.c
mvi.c
mxf.c mxfdec: set pixel format for cdci picture formats 2012-02-28 20:24:01 +01:00
mxf.h mxfdec: set pixel format for cdci picture formats 2012-02-28 20:24:01 +01:00
mxfdec.c mxfdec: Add intra_only flag to MXFTrack 2012-03-08 00:39:56 +01:00
mxfenc.c
mxg.c
ncdec.c
network.c
network.h
nsvdec.c
nullenc.c
nut.c
nut.h
nutdec.c
nutenc.c
nuv.c
oggdec.c Merge remote-tracking branch 'qatar/master' 2012-03-09 01:22:31 +01:00
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c oggparseogm: Fix order or arguments. 2012-03-08 21:31:45 +01:00
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c ogg: don't set codec timebase 2012-03-02 11:11:38 +01:00
oggparsevorbis.c avcodec: add a Vorbis parser to get packet duration 2012-03-03 16:43:11 -05:00
oma.c
oma.h
omadec.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
omaenc.c id3v2enc: split ff_id3v2_write(). 2012-02-29 14:26:14 +01:00
options.c
os_support.c
os_support.h
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pmpdec.c pmpdec: Check for zero audio packets. 2012-02-28 07:20:36 +01:00
psxstr.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
pva.c
qcp.c
qtpalette.h
r3d.c Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
rawdec.c
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
rdt.h
riff.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
riff.h
rl2.c Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
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_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263_rfc2190.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
rtpdec_xiph.c
rtpdec.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263_rfc2190.c rtpenc: Use MB info side data for splitting H263 packets for RFC 2190 2012-03-01 16:08:32 +02:00
rtpenc_h263.c
rtpenc_h264.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c Merge remote-tracking branch 'qatar/master' 2012-03-09 01:22:31 +01:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-03-01 23:11:31 +01:00
rtpproto.c
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
seek.h Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
segafilm.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
segment.c segment: implement wrap around 2012-02-28 15:01:20 +01:00
sierravmd.c
siff.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
smacker.c Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
swf.h
swfdec.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
swfenc.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
tcp.c
thp.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
tiertexseq.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
tls.c
tmv.c
tta.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
tty.c
txd.c
udp.c Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
url.h
utils.c lavf: Add system to seperate relative timestamps from absolute ones. 2012-03-09 19:36:12 +01:00
vc1test.c
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
voc.c
voc.h
vocdec.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
wav.c
wc3movie.c
westwood_aud.c
westwood_vqa.c
wtv.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.c