har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
FFmpeg/libavformat
History
Michael Niedermayer 4727ec3c0e Merge remote branch 'qatar/master' 
* qatar/master:
Not pulled due to wrong author, according to carl:  Add unconditional return statement to yuva420_rgb32_MMX() / yuva420_bgr32_MMX().
  Fix compilation of timefilter test program.
  Add support for AMR-WB encoding via libvo-amrwbenc
  Add an AAC encoder by using the libvo-aacenc library
  g722: Return 8 bits per sample for g722 in av_get_bits_per_sample

Conflicts:
	Changelog

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-04-12 03:48:21 +02:00
..
4xm.c
…
a64.c
…
aacdec.c
…
ac3dec.c
…
adts.h
…
adtsenc.c
…
aea.c
…
aiff.h
…
aiffdec.c
…
aiffenc.c
…
allformats.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
amr.c
…
anm.c
…
apc.c
…
ape.c
…
apetag.c
…
apetag.h
…
applehttp.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
applehttpproto.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
asf.c
…
asf.h
move ff_asf_guid, ff_guidcmp and ff_get_guid into riff.h
2011-04-07 17:54:52 +02:00
asfcrypt.c
…
asfcrypt.h
…
asfdec.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
asfenc.c
…
assdec.c
Merge remote branch 'qatar/master'
2011-04-07 03:32:26 +02:00
assenc.c
…
au.c
…
audiointerleave.c
…
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h
Merge remote branch 'qatar/master'
2011-04-10 03:32:29 +02:00
avi.c
…
avi.h
…
avidec.c
…
avienc.c
…
avio_internal.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
avio.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
avio.h
Merge remote branch 'qatar/master'
2011-04-11 04:08:08 +02:00
aviobuf.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
avisynth.c
…
avlanguage.c
…
avlanguage.h
…
avs.c
…
bethsoftvid.c
…
bfi.c
…
bink.c
…
c93.c
…
caf.c
…
caf.h
…
cafdec.c
…
cavsvideodec.c
…
cdg.c
…
concat.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
crcenc.c
…
cutils.c
…
daud.c
Merge remote branch 'qatar/master'
2011-04-10 03:32:29 +02:00
dfa.c
…
diracdec.c
…
dnxhddec.c
…
dsicin.c
…
dtsdec.c
…
dv.c
…
dv.h
…
dvenc.c
…
dxa.c
…
eacdata.c
…
electronicarts.c
…
ffm.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
ffmdec.c
…
ffmenc.c
…
ffmeta.h
…
ffmetadec.c
…
ffmetaenc.c
…
file.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
filmstripdec.c
…
filmstripenc.c
…
flacdec.c
…
flacenc_header.c
…
flacenc.c
…
flacenc.h
…
flic.c
…
flv.h
…
flvdec.c
flv: Only parse keyframe index when the underlaying protocol allows seeking as we need to seek to read the index
2011-04-09 03:23:49 +02:00
flvenc.c
…
framecrcenc.c
…
gif.c
…
gopher.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
gxf.c
…
gxf.h
…
gxfenc.c
…
h261dec.c
…
h263dec.c
…
h264dec.c
…
http.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
http.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
httpauth.c
…
httpauth.h
…
id3v1.c
…
id3v1.h
…
id3v2.c
…
id3v2.h
…
idcin.c
…
idroqdec.c
…
idroqenc.c
…
iff.c
…
img2.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
ingenientdec.c
…
internal.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
ipmovie.c
…
isom.c
…
isom.h
…
iss.c
…
iv8.c
…
ivfdec.c
…
ivfenc.c
…
jvdec.c
Merge remote branch 'qatar/master'
2011-04-07 03:32:26 +02:00
libavformat.v
…
libnut.c
…
librtmp.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
lmlm4.c
…
lxfdec.c
Merge remote branch 'qatar/master'
2011-04-07 03:32:26 +02:00
m4vdec.c
…
Makefile
Add PlayStation Portable PMP format demuxer
2011-04-06 19:30:42 +02:00
matroska.c
…
matroska.h
…
matroskadec.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
matroskaenc.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
md5enc.c
…
md5proto.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
metadata_compat.c
…
metadata.c
…
metadata.h
…
microdvddec.c
…
microdvdenc.c
…
mm.c
…
mmf.c
…
mms.c
…
mms.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
mmsh.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
mmst.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
mov.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
movenc.c
…
movenc.h
…
movenchint.c
…
mp3dec.c
…
mp3enc.c
…
mpc8.c
…
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
…
mxf.h
…
mxfdec.c
…
mxfenc.c
…
mxg.c
…
ncdec.c
…
network.h
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
nsvdec.c
…
nullenc.c
…
nut.c
…
nut.h
…
nutdec.c
…
nutenc.c
…
nuv.c
…
oggdec.c
oggdec: use av_freep() instead of av_free()
2011-04-11 11:49:36 +02:00
oggdec.h
oggdec: fix demuxing chained audio streams
2011-04-10 04:33:15 +02:00
oggenc.c
…
oggparsedirac.c
…
oggparseflac.c
…
oggparseogm.c
…
oggparseskeleton.c
…
oggparsespeex.c
…
oggparsetheora.c
…
oggparsevorbis.c
…
oma.c
…
options.c
…
os_support.c
…
os_support.h
…
output-example.c
avio: AVIO_ prefixes for URL_ open flags.
2011-04-07 18:07:16 +02:00
pcm.c
…
pcm.h
…
pcmdec.c
…
pcmenc.c
…
pmpdec.c
Add PlayStation Portable PMP format demuxer
2011-04-06 19:30:42 +02:00
psxstr.c
…
pva.c
…
qcp.c
…
qtpalette.h
…
r3d.c
…
rawdec.c
…
rawdec.h
…
rawenc.c
…
rawenc.h
…
rawvideodec.c
…
rdt.c
…
rdt.h
…
riff.c
Merge remote branch 'qatar/master'
2011-04-11 04:08:08 +02:00
riff.h
move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids)
2011-04-07 17:54:52 +02:00
rl2.c
…
rm.c
…
rm.h
…
rmdec.c
…
rmenc.c
…
rpl.c
…
rso.c
…
rso.h
…
rsodec.c
…
rsoenc.c
…
rtmp.h
…
rtmppkt.c
…
rtmppkt.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
rtmpproto.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
rtp.c
…
rtp.h
…
rtpdec_amr.c
…
rtpdec_asf.c
…
rtpdec_formats.h
…
rtpdec_h263.c
…
rtpdec_h264.c
…
rtpdec_latm.c
…
rtpdec_mpeg4.c
…
rtpdec_qcelp.c
…
rtpdec_qdm2.c
…
rtpdec_qt.c
Merge remote branch 'qatar/master'
2011-04-07 03:32:26 +02:00
rtpdec_svq3.c
…
rtpdec_vp8.c
…
rtpdec_xiph.c
…
rtpdec.c
…
rtpdec.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
rtpenc_aac.c
…
rtpenc_amr.c
…
rtpenc_chain.c
…
rtpenc_chain.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
rtpenc_h263.c
…
rtpenc_h264.c
…
rtpenc_mpv.c
…
rtpenc_vp8.c
…
rtpenc_xiph.c
…
rtpenc.c
…
rtpenc.h
…
rtpproto.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
rtsp.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
rtsp.h
…
rtspcodes.h
…
rtspdec.c
…
rtspenc.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
sapdec.c
Merge remote branch 'qatar/master'
2011-04-08 02:50:13 +02:00
sapenc.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
sauce.c
…
sauce.h
…
sdp.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
seek.c
…
seek.h
…
segafilm.c
…
sierravmd.c
…
siff.c
…
smacker.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 branch 'qatar/master'
2011-04-09 03:17:07 +02:00
thp.c
…
tiertexseq.c
…
timefilter.c
Merge remote branch 'qatar/master'
2011-04-12 03:48:21 +02:00
timefilter.h
…
tmv.c
…
tta.c
…
tty.c
…
txd.c
…
udp.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
url.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
utils.c
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
vc1test.c
…
vc1testenc.c
…
version.h
Merge remote branch 'qatar/master'
2011-04-09 03:17:07 +02:00
voc.c
…
voc.h
…
vocdec.c
…
vocenc.c
…
vorbiscomment.c
…
vorbiscomment.h
…
vqf.c
…
wav.c
…
wc3movie.c
…
westwood.c
…
wtv.c
move PRI_GUID, ARG_GUID, AVCodecGuid, ff_codec_guid_get_id, MEDIASUBTYPE_BASE_GUID and audio_guids[] to riff.c/h (add FF_ prefix to PRI_GUID, ARG_GUID, and MEDIASUBTYPE_BASE_GUID; rename audio_guids to ff_codec_wav_guids)
2011-04-07 17:54:52 +02:00
wv.c
…
xa.c
…
yop.c
…
yuv4mpeg.c
…