har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
FFmpeg/libavformat
History
Michael Niedermayer 92ef4be4ab Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  ARM: allow runtime masking of CPU features
  dsputil: remove unused functions
  mov: Treat keyframe indexes as 1-origin if starting at non-zero.
  mov: Take stps entries into consideration also about key_off.
  Remove lowres video decoding

Conflicts:
	ffmpeg.c
	ffplay.c
	libavcodec/arm/vp8dsp_init_arm.c
	libavcodec/libopenjpegdec.c
	libavcodec/mjpegdec.c
	libavcodec/mpegvideo.c
	libavcodec/utils.c
	libavformat/mov.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-22 22:26:42 +02:00
..
4xm.c
4xmdemux: Check chunk size
2012-04-16 15:27:39 +02:00
a64.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
aacdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
ac3dec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
act.c
…
adts.h
…
adtsenc.c
…
adxdec.c
…
aea.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
aiff.h
…
aiffdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
aiffenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
allformats.c
…
amr.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
anm.c
…
apc.c
…
ape.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
apetag.c
…
apetag.h
…
asf.c
…
asf.h
…
asfcrypt.c
…
asfcrypt.h
…
asfdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-07 22:41:37 +02:00
asfenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
assdec.c
…
assenc.c
…
au.c
audemux: Fix potential integer overflow leading to a division by 0
2012-04-22 15:34:21 +02:00
audiointerleave.c
…
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h
Add skip_to_keyframe stream variable.
2012-04-16 22:13:11 +02:00
avi.h
…
avidec.c
avidec: zero extradata padding
2012-04-19 22:52:34 +02:00
avienc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
avio_internal.h
…
avio.c
…
avio.h
Merge remote-tracking branch 'qatar/master'
2012-04-19 21:23:52 +02:00
aviobuf.c
Add AVIO_FLAG_DIRECT.
2012-04-04 20:39:33 +02:00
avisynth.c
…
avlanguage.c
…
avlanguage.h
…
avs.c
…
bethsoftvid.c
…
bfi.c
…
bink.c
…
bintext.c
…
bit.c
…
bluray.c
…
bmv.c
cosmetics: Align muxer/demuxer declarations
2012-04-06 19:19:59 +03:00
c93.c
…
cache.c
…
caf.c
…
caf.h
…
cafdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
cafenc.c
…
cavsvideodec.c
…
cdg.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
cdxl.c
…
concat.c
…
crcenc.c
…
crypto.c
…
cutils.c
…
daud.c
Merge remote-tracking branch 'qatar/master'
2012-04-20 22:18:26 +02:00
dfa.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
diracdec.c
…
dnxhddec.c
…
dsicin.c
…
dtsdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
dv.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
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
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
filmstripenc.c
…
flacdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
flacenc_header.c
…
flacenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
flacenc.h
…
flic.c
…
flv.h
…
flvdec.c
flvdec: allocate large enough buffer so get_bits() doesnt overread
2012-04-16 12:01:55 +02:00
flvenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
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-04-02 00:17:02 +02:00
id3v2.h
…
id3v2enc.c
…
idcin.c
…
idroqdec.c
…
idroqenc.c
…
iff.c
…
img2.c
lavc: add a OpenEXR decoder
2012-04-06 08:32:09 +02:00
img2dec.c
…
img2enc.c
…
ingenientdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
internal.h
…
ipmovie.c
…
isom.c
Support detecting and demuxing EIA-608 subtitles in mov.
2012-04-07 22:11:21 +02:00
isom.h
Merge remote-tracking branch 'qatar/master'
2012-04-14 22:37:43 +02:00
iss.c
…
iv8.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
ivfdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
ivfenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
jvdec.c
jvdec: Make sure there is enough data for the id string.
2012-04-19 21:43:15 +02:00
latmenc.c
latmenc: replace per-frame malloc/free by constant size buffer.
2012-04-14 18:21:19 +02:00
libavformat.v
…
libmodplug.c
…
libnut.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
librtmp.c
…
lmlm4.c
…
loasdec.c
…
lxfdec.c
…
m4vdec.c
…
Makefile
…
matroska.c
…
matroska.h
…
matroskadec.c
Merge remote-tracking branch 'qatar/master'
2012-04-18 22:08:28 +02:00
matroskaenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
md5enc.c
…
md5proto.c
…
metadata.c
…
metadata.h
…
mgsts.c
…
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
…
mov.c
Merge remote-tracking branch 'qatar/master'
2012-04-22 22:26:42 +02:00
movenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-21 22:56:07 +02:00
movenc.h
…
movenchint.c
…
mp3dec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mp3enc.c
mp3enc: clarify meaning of "Unsupported" messages.
2012-04-14 18:21:19 +02:00
mpc8.c
…
mpc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mpeg.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mpeg.h
…
mpegenc.c
mpegpsenc: fix user specified mux rate
2012-04-07 07:56:55 +02:00
mpegts.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mpegts.h
…
mpegtsenc.c
mpegtsenc: Add support to mux s302 stream
2012-04-08 09:44:14 +02:00
mpegvideodec.c
…
mpjpeg.c
…
msnwc_tcp.c
…
mtv.c
mtvdec: check that the buf is large enough for probing
2012-04-19 22:11:19 +02:00
mvi.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mxf.c
…
mxf.h
mxf: Fix frame layout values
2012-04-19 15:08:13 +02:00
mxfdec.c
mxfdec: fix memleak on read error/EOF.
2012-04-20 20:58:45 +02:00
mxfenc.c
mxfenc: Don't allow muxing audio-only since it's not supported
2012-04-03 10:11:27 +02:00
mxg.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
ncdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
network.c
…
network.h
…
nsvdec.c
…
nullenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
nut.c
Support yuva444p rawvideo in nut.
2012-04-06 00:53:09 +02:00
nut.h
…
nutdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-19 21:23:52 +02:00
nutenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
nuv.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
oggdec.c
oggdec: Safety check against stream counts being inconsistent in seek()
2012-04-17 14:44:06 +02:00
oggdec.h
…
oggenc.c
…
oggparsecelt.c
…
oggparsedirac.c
…
oggparseflac.c
…
oggparseogm.c
ogm: Fix division by 0
2012-04-18 15:30:34 +02:00
oggparseskeleton.c
…
oggparsespeex.c
…
oggparsetheora.c
…
oggparsevorbis.c
oggparsevorbis: Remove code messing with cur_dts.
2012-04-11 14:56:02 +02:00
oma.c
omadec: make sample rate table large enough to prevent out of array reading.
2012-04-16 18:36:39 +02:00
oma.h
omadec: make sample rate table large enough to prevent out of array reading.
2012-04-16 18:36:39 +02:00
omadec.c
omadec: check GEOB sizes against buffer size
2012-04-16 13:51:40 +02:00
omaenc.c
…
options_table.h
Add AVIO_FLAG_DIRECT.
2012-04-04 20:39:33 +02:00
options.c
…
os_support.c
…
os_support.h
…
pcm.c
…
pcm.h
…
pcmdec.c
…
pcmenc.c
…
pmpdec.c
…
psxstr.c
…
pva.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
qcp.c
…
qtpalette.h
…
r3d.c
…
rawdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
rawdec.h
…
rawenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-13 00:39:19 +02:00
rawenc.h
…
rawvideodec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
rdt.c
…
rdt.h
…
riff.c
riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header
2012-04-17 00:09:19 -04:00
riff.h
…
rl2.c
…
rm.c
…
rm.h
…
rmdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-20 22:18:26 +02:00
rmenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
rpl.c
…
rso.c
…
rso.h
…
rsodec.c
…
rsoenc.c
…
rtmp.h
…
rtmppkt.c
…
rtmppkt.h
…
rtmpproto.c
Merge remote-tracking branch 'qatar/master'
2012-04-18 00:28:06 +02:00
rtp.c
…
rtp.h
…
rtpdec_amr.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
rtpdec_asf.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
rtpdec_formats.h
…
rtpdec_g726.c
…
rtpdec_h263_rfc2190.c
…
rtpdec_h263.c
…
rtpdec_h264.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
rtpdec_latm.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
rtpdec_mpeg4.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
rtpdec_qcelp.c
…
rtpdec_qdm2.c
…
rtpdec_qt.c
…
rtpdec_svq3.c
…
rtpdec_vp8.c
…
rtpdec_xiph.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
rtpdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
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-04-06 22:52:01 +02:00
rtpenc.h
…
rtpproto.c
…
rtsp.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
rtsp.h
…
rtspcodes.h
…
rtspdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-08 20:55:11 +02:00
rtspenc.c
…
sapdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
sapenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
sauce.c
…
sauce.h
…
sbgdec.c
…
sdp.c
…
seek-test.c
…
seek.c
…
seek.h
…
segafilm.c
segafilm: make the loop condition in film_read_packet() match the contents.
2012-04-16 02:18:09 +02:00
segment.c
…
sierravmd.c
…
siff.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
smacker.c
smackerdemux: Allocate padding for extradata
2012-04-22 11:23:58 +02:00
smjpeg.c
…
smjpeg.h
…
smjpegdec.c
…
smjpegenc.c
…
sol.c
…
sox.h
…
soxdec.c
…
soxenc.c
…
spdif.c
…
spdif.h
…
spdifdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
spdifenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
srtdec.c
…
swf.h
swfdec: support compressed swf.
2012-04-03 19:12:52 +02:00
swfdec.c
swfdec: support compressed swf.
2012-04-03 19:12:52 +02:00
swfenc.c
…
tcp.c
…
thp.c
…
tiertexseq.c
…
tls.c
…
tmv.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
tta.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
tty.c
…
txd.c
…
udp.c
…
url.h
…
utils.c
lavf: check that the context to avformat_open_input() is valid.
2012-04-18 15:30:34 +02:00
vc1test.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
vc1testenc.c
…
version.h
…
voc.c
…
voc.h
…
vocdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
vocenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
vorbiscomment.c
…
vorbiscomment.h
…
vqf.c
…
wav.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
wc3movie.c
…
westwood_aud.c
…
westwood_vqa.c
…
wtv.c
…
wtv.h
…
wtvdec.c
wtvdec: Check that stream private context has been allocated before use.
2012-04-22 15:29:34 +02:00
wtvenc.c
…
wv.c
…
xa.c
…
xmv.c
xmvdemux: prefer av_freep() to deallocate audio stream structs.
2012-04-21 19:42:44 +02:00
xwma.c
…
yop.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
yuv4mpeg.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00