xaymar/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
87dced8074cf83e74e69d7dee725c8d62601c4e8
FFmpeg/libavformat
T
History
Michael Niedermayer 87dced8074 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  fix hardcoded tables compililation caused by missing math constants
  lavf: Make codec_tag arrays constant
  twinvq: give massive struct a name.
  lavf, lavu: version bumps and APIchanges for av_gettime() move
  lavfi/audio: don't set cur_buf in ff_filter_samples().
  lavfi/fifo: add audio version of the fifo filter.
  fifo: fix parenthesis placement.
  lavfi: rename vf_fifo.c -> fifo.c
  lavc: remove stats_in from AVCodecContext options table.

Conflicts:
	doc/APIchanges
	libavfilter/Makefile
	libavfilter/allfilters.c
	libavfilter/audio.c
	libavfilter/fifo.c
	libavformat/version.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-21 22:37:43 +02:00
..
4xm.c
…
a64.c
…
aacdec.c
…
ac3dec.c
…
act.c
…
adtsenc.c
…
adxdec.c
…
aea.c
…
aiff.h
…
aiffdec.c
…
aiffenc.c
…
allformats.c
LucasArts SMUSH demuxer
2012-06-21 02:27:53 +00:00
amr.c
Merge remote-tracking branch 'qatar/master'
2012-06-18 20:07:00 +02:00
anm.c
…
apc.c
…
ape.c
…
apetag.c
…
apetag.h
…
asf.c
…
asf.h
…
asfcrypt.c
…
asfcrypt.h
…
asfdec.c
asfdec: fix returned error codes
2012-06-14 02:45:11 +02:00
asfenc.c
…
assdec.c
…
assenc.c
…
au.c
…
audiointerleave.c
…
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h
avformat: add 48 fps to the NTSC framerates
2012-06-21 12:04:47 +02:00
avi.h
…
avidec.c
avidec: add .category
2012-06-19 16:26:01 +00:00
avienc.c
avienc: use av_assert
2012-06-17 17:10:05 +02:00
avio_internal.h
…
avio.c
…
avio.h
avio: av_protocol_next() is gone
2012-06-20 01:56:03 +00:00
aviobuf.c
lavf/aviobuf: use av_assert()
2012-06-15 19:44:42 +02:00
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
Merge remote-tracking branch 'qatar/master'
2012-06-21 22:37:43 +02:00
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.h
…
dvenc.c
…
dxa.c
…
eacdata.c
…
electronicarts.c
…
ffm.h
…
ffmdec.c
…
ffmenc.c
ffmenc: use av_assert
2012-06-16 17:59:01 +02:00
ffmeta.h
…
ffmetadec.c
…
ffmetaenc.c
…
file.c
file: Fix handling of windows named pipes
2012-06-15 15:05:33 +02:00
filmstripdec.c
…
filmstripenc.c
…
flacdec.c
Merge remote-tracking branch 'qatar/master'
2012-06-16 23:22:42 +02:00
flacenc_header.c
…
flacenc.c
…
flacenc.h
…
flic.c
…
flv.h
…
flvdec.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
flvenc.c
flvenc: use av_assert instead of assert
2012-06-11 20:14:22 +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
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
http.h
…
httpauth.c
…
httpauth.h
…
icodec.c
…
id3v1.c
…
id3v1.h
…
id3v2.c
…
id3v2.h
…
id3v2enc.c
…
idcin.c
…
idroqdec.c
…
idroqenc.c
…
iff.c
…
ilbc.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
img2.c
…
img2dec.c
…
img2enc.c
…
ingenientdec.c
…
internal.h
…
ipmovie.c
…
isom.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
isom.h
mov: parse tref atom.
2012-06-11 07:35:14 +02:00
iss.c
…
iv8.c
…
ivfdec.c
Merge remote-tracking branch 'qatar/master'
2012-06-21 22:37:43 +02:00
ivfenc.c
…
jacosubdec.c
…
jacosubenc.c
…
jvdec.c
…
latmenc.c
…
libavformat.v
…
libmodplug.c
…
libnut.c
…
librtmp.c
…
lmlm4.c
…
loasdec.c
…
lxfdec.c
…
m4vdec.c
…
Makefile
lavf: add a real SRT muxer.
2012-06-21 20:52:56 +02:00
matroska.c
…
matroska.h
…
matroskadec.c
matroskadec: add assert on lack of overflow in pkt_size+offset
2012-06-15 01:35:52 +02:00
matroskaenc.c
…
md5enc.c
…
md5proto.c
…
metadata.c
…
metadata.h
…
mgsts.c
…
microdvddec.c
lavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error.
2012-06-15 18:40:14 +02:00
microdvdenc.c
…
mkvtimestamp_v2.c
…
mm.c
…
mmf.c
…
mms.c
…
mms.h
…
mmsh.c
…
mmst.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
mov_chan.c
mov_chan: Fix operator precedence by adding parentheses
2012-06-17 17:51:50 +03:00
mov_chan.h
…
mov.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
movenc.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
movenc.h
movenc: add timecode track support.
2012-06-11 07:35:14 +02:00
movenchint.c
…
mp3dec.c
…
mp3enc.c
…
mpc8.c
…
mpc.c
…
mpeg.c
…
mpeg.h
…
mpegenc.c
…
mpegts.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
mpegts.h
…
mpegtsenc.c
mpegtsenc: use av_assert
2012-06-13 18:51:38 +02:00
mpegvideodec.c
…
mpjpeg.c
…
msnwc_tcp.c
…
mtv.c
…
mvi.c
…
mxf.c
…
mxf.h
…
mxfdec.c
…
mxfenc.c
…
mxg.c
…
ncdec.c
…
network.c
…
network.h
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
nsvdec.c
…
nullenc.c
…
nut.c
…
nut.h
…
nutdec.c
…
nutenc.c
nutenc: use av_assert
2012-06-15 19:44:42 +02:00
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
…
oma.h
…
omadec.c
…
omaenc.c
…
options_table.h
…
options.c
lavf: separate muxer/demuxer class category
2012-06-19 17:22:07 +02:00
os_support.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
os_support.h
…
pcm.c
…
pcm.h
…
pcmdec.c
pcmdec: use av_assert()
2012-06-14 23:52:23 +02:00
pcmenc.c
…
pmpdec.c
…
psxstr.c
…
pva.c
…
qcp.c
…
qtpalette.h
…
r3d.c
…
rawdec.c
rawdec: use av_assert()
2012-06-14 23:52:40 +02:00
rawdec.h
…
rawenc.c
lavf: add a real SRT muxer.
2012-06-21 20:52:56 +02:00
rawenc.h
…
rawvideodec.c
…
rdt.c
…
rdt.h
…
riff.c
riff: don't overwrite bps from WAVEFORMATEX if EXTENSIBLE doesn't contain that data.
2012-06-21 13:25:50 +02:00
riff.h
…
rl2.c
…
rm.c
…
rm.h
…
rmdec.c
…
rmenc.c
…
rpl.c
…
rso.c
…
rso.h
…
rsodec.c
…
rsoenc.c
…
rtmp.h
…
rtmphttp.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
rtmppkt.c
Merge remote-tracking branch 'qatar/master'
2012-06-15 00:14:21 +02:00
rtmppkt.h
Merge remote-tracking branch 'qatar/master'
2012-06-15 00:14:21 +02:00
rtmpproto.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
rtp.c
…
rtp.h
…
rtpdec_amr.c
…
rtpdec_asf.c
…
rtpdec_formats.h
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
rtpdec_g726.c
…
rtpdec_h263_rfc2190.c
rtpdec: Don't require frames to start with a Mode A packet
2012-06-14 22:11:43 +03:00
rtpdec_h263.c
…
rtpdec_h264.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
rtpdec_ilbc.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
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-06-19 20:53:27 +02:00
rtpdec.h
…
rtpenc_aac.c
…
rtpenc_amr.c
…
rtpenc_chain.c
…
rtpenc_chain.h
…
rtpenc_h263_rfc2190.c
…
rtpenc_h263.c
Change all uses of restrict to use av_restrict instead.
2012-06-17 00:38:39 +02:00
rtpenc_h264.c
Merge remote-tracking branch 'qatar/master'
2012-06-18 20:07:00 +02:00
rtpenc_latm.c
…
rtpenc_mpv.c
…
rtpenc_vp8.c
…
rtpenc_xiph.c
…
rtpenc.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
rtpenc.h
Merge remote-tracking branch 'qatar/master'
2012-06-18 20:07:00 +02:00
rtpproto.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
rtsp.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
rtsp.h
…
rtspcodes.h
…
rtspdec.c
…
rtspenc.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
sapdec.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
sapenc.c
…
sauce.c
…
sauce.h
…
sbgdec.c
…
sctp.c
Remove unnecessary inclusions of [sys/]time.h
2012-06-20 11:46:46 +01:00
sdp.c
Merge remote-tracking branch 'qatar/master'
2012-06-19 20:53:27 +02:00
seek-test.c
…
seek.c
…
seek.h
…
segafilm.c
…
segment.c
Merge remote-tracking branch 'qatar/master'
2012-06-15 20:56:06 +02:00
sierravmd.c
…
siff.c
…
smacker.c
…
smjpeg.c
…
smjpeg.h
…
smjpegdec.c
…
smjpegenc.c
…
smush.c
smush: set audio packet duration
2012-06-21 12:14:53 +00:00
sol.c
…
sox.h
…
soxdec.c
…
soxenc.c
…
spdif.c
…
spdif.h
…
spdifdec.c
…
spdifenc.c
…
srtdec.c
lavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error.
2012-06-15 18:40:14 +02:00
srtenc.c
lavf: add a real SRT muxer.
2012-06-21 20:52:56 +02:00
swf.h
…
swfdec.c
…
swfenc.c
…
tcp.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +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-06-20 20:47:46 +02:00
url.h
…
utils.c
avformat: add 48 fps to the NTSC framerates
2012-06-21 12:04:47 +02:00
vc1test.c
…
vc1testenc.c
…
version.h
Merge remote-tracking branch 'qatar/master'
2012-06-21 22:37:43 +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
…
wtv.c
…
wtv.h
…
wtvdec.c
…
wtvenc.c
…
wv.c
…
xa.c
…
xmv.c
…
xwma.c
…
yop.c
…
yuv4mpeg.c
…