RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 17:55:21 +00:00
Code Issues Projects Releases Wiki Activity
ec0965be36
ffmpeg/libavformat
History
Michael Niedermayer 2b7c0c9fe1 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  mp3dec: perform I/S and M/S only when frame mode is joint stereo.
  id3v2: add another mimetype for JPEG image
  lzw: prevent buffer overreads.
  WMAL: Remove inaccurate and unnecessary doxy
  h264: fix cabac-on-stack after safe cabac reader.
  truemotion2: convert packet header reading to bytestream2.

Conflicts:
	libavcodec/lzw.c
	libavcodec/truemotion2.c
	libavformat/id3v2.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-30 06:05:39 +02: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-22 20:59:58 +01:00
aiffenc.c
allformats.c "Metal Gear Solid: The Twin Snakes" demuxer 2012-03-25 12:22:06 +02:00
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
asf.c
asf.h
asfcrypt.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
asfenc.c
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avc.h Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avformat.h Merge remote-tracking branch 'qatar/master' 2012-03-27 11:59:39 +02:00
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
avienc.c
avio_internal.h
avio.c
avio.h cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
aviobuf.c
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bluray.c
bmv.c
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c
concat.c
crcenc.c
crypto.c
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c DV demuxer: Stricter check for avio_read result. 2012-03-10 10:43:14 +01:00
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c electronicarts vp6: set duration of video stream 2012-03-22 13:15:17 +01:00
ffm.h
ffmdec.c
ffmenc.c
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 flv: clarify use of video info/cmd frame. 2012-03-20 07:53:40 +01:00
flvdec.c flv: clarify use of video info/cmd frame. 2012-03-20 07:53:40 +01:00
flvenc.c Revert "flvenc: Remove apparently unneeded AAC check." 2012-03-12 20:42:25 +01:00
framecrcenc.c
framehash.c
g723_1.c
g729dec.c
gif.c
gopher.c
gsmdec.c
gxf.c gxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet function 2012-03-19 13:33:24 +01:00
gxf.h
gxfenc.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
h261dec.c
h263dec.c
h264dec.c
hls.c
hlsproto.c
http.c Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
http.h
httpauth.c Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
httpauth.h Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
icodec.c
id3v1.c
id3v1.h
id3v2.c Merge remote-tracking branch 'qatar/master' 2012-03-30 06:05:39 +02:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
img2.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
img2dec.c img2dec: remove GLOB_TILDE support. 2012-03-30 05:16:15 +02:00
img2enc.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
ingenientdec.c
internal.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
ipmovie.c
isom.c Support FLIC in MOV. 2012-03-26 20:03:56 +02:00
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
latmenc.c
libavformat.v libavformat.v: add ffio_set_buf_size() for ffserver. 2012-03-12 06:04:37 +01:00
libmodplug.c
libnut.c
librtmp.c
lmlm4.c
loasdec.c
lxfdec.c
m4vdec.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
matroska.c
matroska.h
matroskadec.c matroskadec: fix strcmp(NULL) 2012-03-23 01:27:49 +01:00
matroskaenc.c matroskaenc: change cluster_pos to use -1 as the "I'm not currently working on a cluster" signal instead of 0. 2012-03-14 21:51:38 +01:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c Enable generic index/seeking for mgsts demuxer. 2012-03-26 20:03:57 +02:00
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c mmdemux: dont set pkt->size to an invalid value. 2012-03-23 00:50:49 +01:00
mmf.c Fix type and codetype fields in the MMF header for some phones. 2012-03-21 22:19:23 +01:00
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c mov: Add missing terminator to mov_ch_layout_map_1ch. 2012-03-22 13:56:44 -07:00
mov_chan.h
mov.c mov: fix heap buffer overflow 2012-03-25 04:25:24 +02:00
movenc.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
movenc.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
movenchint.c
mp3dec.c mp3_probe: consider id3 tags to be low scoring mp3. 2012-03-19 20:49:04 +01:00
mp3enc.c
mpc8.c
mpc.c
mpeg.c
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
mpegts.c Merge remote-tracking branch 'qatar/master' 2012-03-27 11:59:39 +02:00
mpegts.h
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2012-03-26 20:52:52 +02:00
mpegvideodec.c mpegvideo_probe: Fix misdetection of mpeg4video files. 2012-03-09 22:25:32 +01:00
mpjpeg.c mpjpeg: video streaming will no longer break and stop on Firefox 2012-03-10 18:32:02 +01:00
msnwc_tcp.c
mtv.c
mvi.c
mxf.c mxf: Add DNxHD UL 2012-03-10 18:01:03 +01:00
mxf.h Fix frame height vs field height confusion in MXF decoding. 2012-03-11 17:39:52 +01:00
mxfdec.c mxfdec: fix off by one error. 2012-03-26 15:05:02 +02: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 cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
oggparseogm.c oggparseogm: fix order of arguments of avpriv_set_pts_info(). 2012-03-22 19:51:43 +01:00
oggparseskeleton.c vorbisdemux: Check private context in theoras gtopts. 2012-03-23 04:29:33 +01:00
oggparsespeex.c
oggparsetheora.c vorbisdemux: Check private context in theoras gtopts. 2012-03-23 04:29:33 +01:00
oggparsevorbis.c oggdec: output correct timestamps for Vorbis 2012-03-20 14:39:57 -04:00
oma.c
oma.h
omadec.c oma: dont over-read buffer 2012-03-27 12:52:53 +02:00
omaenc.c
options_table.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
options.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
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 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
rdt.h
riff.c Support FLIC in AVI. 2012-03-28 02:34:06 +02:00
riff.h
rl2.c
rm.c Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +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 Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
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
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263_rfc2190.c
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-21 01:33:53 +01:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
rtpproto.c
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
rtsp.h
rtspcodes.h
rtspdec.c Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
rtspenc.c Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
sapdec.c
sapenc.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
sauce.c
sauce.h
sbgdec.c
sdp.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
seek-test.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
seek.c
seek.h
segafilm.c
segment.c segment: fix null pointer dereference 2012-03-22 13:43:26 +01:00
sierravmd.c
siff.c
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
swfenc.c
tcp.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c
udp.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
url.h Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
utils.c lavf: print ts values in pts < dts error message 2012-03-29 20:31:14 +02:00
vc1test.c
vc1testenc.c
version.h "Metal Gear Solid: The Twin Snakes" demuxer 2012-03-25 12:22:06 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c
wc3movie.c
westwood_aud.c
westwood_vqa.c westwood_vqa: fix SND0 chunk handling 2012-03-27 11:58:15 -04:00
wtv.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
xa.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
xmv.c xmv: check channel number 2012-03-23 10:31:45 +01:00
xwma.c Merge remote-tracking branch 'qatar/master' 2012-03-22 23:16:49 +01:00
yop.c
yuv4mpeg.c