har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
FFmpeg/libavformat
History
Michael Niedermayer 674216991d Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  build: Fix APE tag dependencies
  MS Expression Encoder Screen decoder
  libfdk-aac: Allow setting the encoder bandwidth/cutoff frequency

Conflicts:
	Changelog
	libavcodec/avcodec.h
	libavcodec/version.h
	libavformat/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-07-13 22:22:24 +02:00
..
4xm.c
…
a64.c
…
aacdec.c
…
ac3dec.c
…
act.c
…
adtsenc.c
…
adxdec.c
…
aea.c
…
aiff.h
…
aiffdec.c
lavf/aiffdec: handle ID3 chunk
2012-07-01 20:59:37 +02:00
aiffenc.c
…
allformats.c
PAF demuxer and decoder
2012-07-05 02:54:34 +00:00
amr.c
…
anm.c
…
apc.c
…
ape.c
Merge remote-tracking branch 'qatar/master'
2012-06-24 21:34:54 +02:00
apetag.c
Merge remote-tracking branch 'qatar/master'
2012-07-02 21:19:41 +02:00
apetag.h
…
asf.c
…
asf.h
…
asfcrypt.c
…
asfcrypt.h
…
asfdec.c
Merge remote-tracking branch 'qatar/master'
2012-07-02 21:19:41 +02:00
asfenc.c
…
assdec.c
…
assenc.c
…
au.c
…
audiointerleave.c
…
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h
lavf: inject sample skip side data when requested by the demuxer
2012-07-12 20:32:03 +02:00
avi.h
…
avidec.c
avidec: switch to av_assert
2012-07-11 23:26:55 +02:00
avienc.c
…
avio_internal.h
…
avio.c
Merge remote-tracking branch 'qatar/master'
2012-06-22 22:34:02 +02:00
avio.h
…
aviobuf.c
cosmetics: various spelling fixes
2012-07-06 17:08:22 +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
Replace Libav with FFmpeg in license headers for files created by me
2012-06-29 01:58:34 +00:00
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
…
ffmeta.h
…
ffmetadec.c
…
ffmetaenc.c
…
file.c
lavf/file: cosmetic: Use "not" instead of "equals zero"
2012-07-05 10:55:49 +02:00
filmstripdec.c
…
filmstripenc.c
…
flacdec.c
Merge remote-tracking branch 'qatar/master'
2012-07-08 22:33:32 +02:00
flacenc_header.c
…
flacenc.c
…
flacenc.h
…
flic.c
…
flv.h
Merge remote-tracking branch 'qatar/master'
2012-06-28 23:57:31 +02:00
flvdec.c
Merge remote-tracking branch 'qatar/master'
2012-07-07 02:17:30 +02:00
flvenc.c
Merge remote-tracking branch 'qatar/master'
2012-06-28 23:57:31 +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
cosmetics: various spelling fixes
2012-07-06 17:08:22 +02:00
hlsproto.c
cosmetics: various spelling fixes
2012-07-06 17:08:22 +02:00
http.c
http: try to detect live akamai streams and dont enable seeking for them
2012-06-28 00:18:24 +02:00
http.h
cosmetics: various spelling fixes
2012-07-06 17:08:22 +02:00
httpauth.c
…
httpauth.h
…
icodec.c
…
id3v1.c
…
id3v1.h
…
id3v2.c
Merge remote-tracking branch 'qatar/master'
2012-07-08 22:33:32 +02:00
id3v2.h
…
id3v2enc.c
…
idcin.c
…
idroqdec.c
…
idroqenc.c
…
iff.c
…
ilbc.c
…
img2.c
Recognize yuv10 image files as v210x.
2012-07-10 13:27:16 +02:00
img2dec.c
Merge remote-tracking branch 'qatar/master'
2012-06-24 21:34:54 +02:00
img2enc.c
Merge remote-tracking branch 'qatar/master'
2012-06-24 21:34:54 +02:00
ingenientdec.c
…
internal.h
…
ipmovie.c
…
isom.c
…
isom.h
…
iss.c
…
iv8.c
…
ivfdec.c
Merge remote-tracking branch 'qatar/master'
2012-06-21 22:37:43 +02:00
ivfenc.c
…
jacosubdec.c
lavf/jacosubdec: fix FPE in case timeres is badly set.
2012-06-29 20:19:59 +02:00
jacosubenc.c
…
jvdec.c
jvdec: fix memleak of jv->frames
2012-07-03 09:53:42 +00:00
latmenc.c
…
libavformat.v
FireWire DV/HDV input device using libiec61883
2012-07-05 13:02:49 +02:00
libmodplug.c
…
libnut.c
…
librtmp.c
…
lmlm4.c
…
loasdec.c
…
lxfdec.c
…
m4vdec.c
…
Makefile
Merge remote-tracking branch 'qatar/master'
2012-07-13 22:22:24 +02:00
matroska.c
…
matroska.h
…
matroskadec.c
Merge remote-tracking branch 'qatar/master'
2012-07-09 22:40:12 +02:00
matroskaenc.c
matroskaenc: switch to av_assert
2012-07-13 17:03:57 +02:00
md5enc.c
…
md5proto.c
…
metadata.c
…
metadata.h
…
mgsts.c
…
microdvddec.c
lavf/microdvd: rewrite using subtitles queue API.
2012-06-29 20:20:01 +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
movenc: Add channel layouts for PCM.
2012-06-27 13:47:58 -07:00
mov_chan.h
…
mov.c
Merge remote-tracking branch 'qatar/master'
2012-07-04 21:03:28 +02:00
movenc.c
movenc: Addtion of \251cmt field to udta
2012-07-09 15:30:59 +02:00
movenc.h
…
movenchint.c
…
mp3dec.c
mp3dec: parse initial silence padding information from lame tag
2012-07-12 22:25:25 +02:00
mp3enc.c
…
mpc8.c
Merge remote-tracking branch 'qatar/master'
2012-06-27 01:58:09 +02:00
mpc.c
…
mpeg.c
…
mpeg.h
…
mpegenc.c
…
mpegts.c
…
mpegts.h
…
mpegtsenc.c
…
mpegvideodec.c
…
mpjpeg.c
…
msnwc_tcp.c
…
mtv.c
…
mvi.c
…
mxf.c
mxfdec: set pixel format for cdci picture formats
2012-07-10 13:51:04 +02:00
mxf.h
mxfdec: fix frame height vs field height confusion
2012-07-10 13:51:04 +02:00
mxfdec.c
Merge remote-tracking branch 'qatar/master'
2012-07-10 20:51:51 +02:00
mxfenc.c
mxfenc: switch to av_assert
2012-07-12 23:16:52 +02:00
mxg.c
…
ncdec.c
…
network.c
Merge remote-tracking branch 'qatar/master'
2012-06-27 01:58:09 +02:00
network.h
Merge remote-tracking branch 'qatar/master'
2012-06-27 01:58:09 +02:00
nsvdec.c
…
nullenc.c
…
nut.c
nut: add 12/14 bit yuv to nut/raw
2012-07-05 04:23:55 +02:00
nut.h
…
nutdec.c
nutdec: set duration_estimation_method
2012-06-30 18:58:52 +02:00
nutenc.c
lavf/nutenc: provide meaningful error message and error code in case of invalid pts
2012-07-08 17:08:56 +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: add proper enum type for fmt ctx duration esitmation method
2012-06-28 09:59:53 +02:00
os_support.c
Merge remote-tracking branch 'qatar/master'
2012-06-30 22:44:18 +02:00
os_support.h
Merge remote-tracking branch 'qatar/master'
2012-06-30 22:44:18 +02:00
paf.c
paf: properly flag video packets
2012-07-08 20:49:04 +00:00
pcm.c
…
pcm.h
…
pcmdec.c
…
pcmenc.c
…
pmpdec.c
…
psxstr.c
…
pva.c
…
qcp.c
…
qtpalette.h
…
r3d.c
…
rawdec.c
…
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
…
realtextdec.c
RealText demuxer and decoder.
2012-06-29 20:22:04 +02:00
riff.c
Merge remote-tracking branch 'qatar/master'
2012-07-13 22:22:24 +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-22 22:34:02 +02:00
rtmppkt.c
…
rtmppkt.h
…
rtmpproto.c
…
rtp.c
…
rtp.h
Merge remote-tracking branch 'qatar/master'
2012-07-04 00:32:31 +02:00
rtpdec_amr.c
…
rtpdec_asf.c
…
rtpdec_formats.h
…
rtpdec_g726.c
…
rtpdec_h263_rfc2190.c
…
rtpdec_h263.c
…
rtpdec_h264.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
rtpdec_ilbc.c
…
rtpdec_latm.c
…
rtpdec_mpeg4.c
cosmetics: various spelling fixes
2012-07-06 17:08:22 +02:00
rtpdec_qcelp.c
…
rtpdec_qdm2.c
…
rtpdec_qt.c
…
rtpdec_svq3.c
…
rtpdec_vp8.c
…
rtpdec_xiph.c
…
rtpdec.c
rtpdec: Don't explicitly include unistd.h any longer
2012-06-29 15:38:10 +03: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
…
rtpenc.h
…
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-07-11 23:57:11 +02:00
rtsp.h
Merge remote-tracking branch 'qatar/master'
2012-07-11 23:57:11 +02:00
rtspcodes.h
Merge remote-tracking branch 'qatar/master'
2012-07-11 23:57:11 +02:00
rtspdec.c
Merge remote-tracking branch 'qatar/master'
2012-07-11 23:57:11 +02:00
rtspenc.c
Merge remote-tracking branch 'qatar/master'
2012-06-20 20:47:46 +02:00
samidec.c
SAMI demuxer and decoder.
2012-06-29 20:21:28 +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
network: Include unistd.h from network.h
2012-06-26 17:22:21 +03:00
sdp.c
…
seek-test.c
…
seek.c
…
seek.h
…
segafilm.c
…
segment.c
lavf/segment: add -segment_time_delta option
2012-07-10 00:53:01 +02:00
sierravmd.c
…
siff.c
…
smacker.c
…
smjpeg.c
…
smjpeg.h
Replace Libav with FFmpeg in license headers for files created by me
2012-06-29 01:58:34 +00:00
smjpegdec.c
Replace Libav with FFmpeg in license headers for files created by me
2012-06-29 01:58:34 +00:00
smjpegenc.c
Replace Libav with FFmpeg in license headers for files created by me
2012-06-29 01:58:34 +00:00
smush.c
smush: properly flag audio packets
2012-07-08 20:49:35 +00:00
sol.c
…
sox.h
…
soxdec.c
…
soxenc.c
…
spdif.c
…
spdif.h
…
spdifdec.c
…
spdifenc.c
…
srtdec.c
…
srtenc.c
lavf: add a real SRT muxer.
2012-06-21 20:52:56 +02:00
subtitles.c
lavf/subtitles: add some SMIL helpers.
2012-06-29 20:20:02 +02:00
subtitles.h
lavf/subtitles: add some SMIL helpers.
2012-06-29 20:20:02 +02:00
swf.h
…
swfdec.c
…
swfenc.c
…
tcp.c
Merge remote-tracking branch 'qatar/master'
2012-07-09 22:40:12 +02:00
thp.c
…
tiertexseq.c
…
tls.c
…
tmv.c
…
tta.c
…
tty.c
…
txd.c
…
udp.c
udp: use av_freep() instead of av_free()
2012-06-28 10:12:04 +02:00
url.h
…
utils.c
lavf: inject sample skip side data when requested by the demuxer
2012-07-12 20:32:03 +02:00
vc1test.c
…
vc1testenc.c
…
version.h
Merge remote-tracking branch 'qatar/master'
2012-07-11 23:57:11 +02:00
voc.c
…
voc.h
…
vocdec.c
…
vocenc.c
vocenc: use new header from codec tag 4
2012-06-25 03:45:29 +02:00
vorbiscomment.c
…
vorbiscomment.h
…
vqf.c
…
wav.c
…
wc3movie.c
…
westwood_aud.c
…
westwood_vqa.c
…
wtv.c
wtv: Check the return value from gmtime
2012-06-25 16:20:08 +03:00
wtv.h
…
wtvdec.c
cosmetics: various spelling fixes
2012-07-06 17:08:22 +02:00
wtvenc.c
…
wv.c
…
xa.c
…
xmv.c
cosmetics: various spelling fixes
2012-07-06 17:08:22 +02:00
xwma.c
…
yop.c
…
yuv4mpeg.c
…