sysutils/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2026-11-11 12:02:22 +03:00
Code Activity
Files
616ef2e8bd1d7426d03097db1c2c359adbf2fecd
ffmpeg/libavformat
History
Michael Niedermayer bff2afb3e9 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  x86: dsputil: Only compile motion_est code when encoders are enabled
  mem: fix typo in check for __ICC
  fate: mp3: drop redundant CMP setting
  rtp: Depacketization of JPEG (RFC 2435)
  Rename ff_put_string to avpriv_put_string
  mjpeg: Rename some symbols to avpriv_* instead of ff_*
  yadif: cosmetics

Conflicts:
	Changelog
	libavcodec/mjpegenc.c
	libavcodec/x86/Makefile
	libavfilter/vf_yadif.c
	libavformat/version.h
	libavutil/mem.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-09-10 14:06:20 +02:00
..
4xm.c
…
a64.c
…
aacdec.c
…
ac3dec.c
ac3dec: fix uninitialized var warning
2012-08-30 05:17:24 +02:00
act.c
…
adtsenc.c
…
adxdec.c
…
aea.c
…
aiff.h
…
aiffdec.c
Merge remote-tracking branch 'qatar/master'
2012-09-07 13:50:24 +02:00
aiffenc.c
…
allformats.c
…
amr.c
…
anm.c
…
apc.c
…
ape.c
…
apetag.c
…
apetag.h
…
apetagenc.c
…
asf.c
…
asf.h
…
asfcrypt.c
…
asfcrypt.h
…
asfdec.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
asfenc.c
…
assdec.c
…
assenc.c
…
au.c
…
audiointerleave.c
…
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h
…
avi.h
…
avidec.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
avienc.c
…
avio_internal.h
…
avio.c
avio: replace ETIMEDOUT by EIO
2012-09-08 02:28:20 +02:00
avio.h
…
aviobuf.c
Merge remote-tracking branch 'qatar/master'
2012-09-04 17:04:51 +02:00
avisynth.c
…
avlanguage.c
…
avlanguage.h
…
avs.c
…
bethsoftvid.c
…
bfi.c
…
bink.c
…
bintext.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
bit.c
…
bluray.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
bmv.c
…
c93.c
…
cache.c
cache: Only include unistd.h if it exists
2012-09-07 19:29:58 +02:00
caf.c
…
caf.h
…
cafdec.c
Merge remote-tracking branch 'qatar/master'
2012-09-07 13:50:24 +02:00
cafenc.c
…
cavsvideodec.c
…
cdg.c
…
cdxl.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
concat.c
…
crcenc.c
…
crypto.c
crypto: Remove a stray double space
2012-08-31 23:27:27 +02:00
cutils.c
…
daud.c
…
dfa.c
…
diracdec.c
…
dnxhddec.c
…
dsicin.c
…
dtsdec.c
…
dv.c
lavf: add missing new line to some error messages
2012-09-01 15:59:30 +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
file: Add S_ISFIFO compatability macro
2012-09-09 20:23:14 +02:00
filmstripdec.c
filmstripdec: add new line to error message
2012-08-31 23:03:18 +02:00
filmstripenc.c
…
flacdec.c
…
flacenc_header.c
…
flacenc.c
…
flacenc.h
…
flic.c
flic: use AV_LOG_ERROR for error message
2012-08-31 23:04:05 +02:00
flv.h
…
flvdec.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
flvenc.c
lavf/flvenc: apply various log fixes/clarifications
2012-09-06 23:39:57 +02:00
framecrcenc.c
…
framehash.c
…
g723_1.c
…
g729dec.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
gif.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
gopher.c
…
gsmdec.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
gxf.c
…
gxf.h
…
gxfenc.c
gxfenc: assert that the to be written data has not been truncated.
2012-09-09 14:31:44 +02:00
h261dec.c
…
h263dec.c
…
h264dec.c
…
hls.c
…
hlsproto.c
…
http.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
http.h
…
httpauth.c
…
httpauth.h
…
icodec.c
…
icoenc.c
…
id3v1.c
…
id3v1.h
…
id3v2.c
lavf: add missing new line to some error messages 2
2012-09-01 17:35:21 +02:00
id3v2.h
…
id3v2enc.c
…
idcin.c
…
idroqdec.c
…
idroqenc.c
…
iff.c
lavf: add missing new line to some error messages
2012-09-01 15:59:30 +02:00
ilbc.c
…
img2.c
…
img2dec.c
img2dec: Don't leave AVIOContexts open on zero byte files
2012-09-07 14:10:19 +02:00
img2enc.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
ingenientdec.c
…
internal.h
…
ipmovie.c
…
isom.c
…
isom.h
Merge remote-tracking branch 'qatar/master'
2012-09-07 13:50:24 +02:00
iss.c
…
iv8.c
…
ivfdec.c
…
ivfenc.c
…
jacosubdec.c
…
jacosubenc.c
…
jvdec.c
…
latmenc.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
libavformat.v
…
libmodplug.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
libnut.c
…
librtmp.c
…
lmlm4.c
…
loasdec.c
…
lxfdec.c
…
m4vdec.c
…
Makefile
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +02:00
matroska.c
…
matroska.h
…
matroskadec.c
matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.
2012-08-31 20:22:49 -07:00
matroskaenc.c
matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.
2012-08-31 20:22:49 -07: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
Merge remote-tracking branch 'qatar/master'
2012-09-08 12:53:44 +02:00
mov_chan.h
mov_chan: Pass a separate AVIOContext for reading
2012-09-07 10:49:35 +03:00
mov.c
Merge remote-tracking branch 'qatar/master'
2012-09-07 13:50:24 +02:00
movenc.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
movenc.h
…
movenchint.c
…
mp3dec.c
…
mp3enc.c
mp2 muxer: mark as AVFMT_NOTIMESTAMPS.
2012-09-07 14:20:14 -07:00
mpc8.c
…
mpc.c
…
mpeg.c
…
mpeg.h
…
mpegenc.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
mpegts.c
mpegts: Fix potential memory leak in mpegts_read_packet()
2012-09-08 05:21:47 +02:00
mpegts.h
…
mpegtsenc.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
mpegvideodec.c
…
mpjpeg.c
…
msnwc_tcp.c
lavf: add missing new line to some error messages
2012-09-01 15:59:30 +02:00
mtv.c
…
mvi.c
…
mxf.c
…
mxf.h
…
mxfdec.c
…
mxfenc.c
lavf: add missing new line to some error messages
2012-09-01 15:59:30 +02:00
mxg.c
…
ncdec.c
…
network.c
…
network.h
…
nsvdec.c
…
nullenc.c
…
nut.c
…
nut.h
…
nutdec.c
Use correct format identifier for uint64_t.
2012-08-27 09:14:40 +02:00
nutenc.c
…
nuv.c
…
oggdec.c
…
oggdec.h
…
oggenc.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
oggparsecelt.c
…
oggparsedirac.c
…
oggparseflac.c
…
oggparseogm.c
…
oggparseopus.c
…
oggparseskeleton.c
…
oggparsespeex.c
…
oggparsetheora.c
…
oggparsevorbis.c
…
oma.c
…
oma.h
…
omadec.c
…
omaenc.c
lavf: add missing new line to some error messages
2012-09-01 15:59:30 +02:00
options_table.h
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
options.c
…
os_support.c
…
os_support.h
eliminate some mingw warnings
2012-09-06 04:42:43 +02:00
paf.c
…
pcm.c
…
pcm.h
…
pcmdec.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
pcmenc.c
…
pmpdec.c
…
psxstr.c
psxstr: more correct array type.
2012-09-01 23:45:32 +02:00
pva.c
…
qcp.c
…
qtpalette.h
…
r3d.c
…
rawdec.c
…
rawdec.h
…
rawenc.c
…
rawenc.h
…
rawvideodec.c
…
rdt.c
…
rdt.h
…
realtextdec.c
…
riff.c
Merge remote-tracking branch 'qatar/master'
2012-08-31 13:34:32 +02:00
riff.h
…
rl2.c
…
rm.c
…
rm.h
…
rmdec.c
rmdec: remove unused variable
2012-09-03 22:40:41 +02:00
rmenc.c
…
rpl.c
…
rso.c
…
rso.h
…
rsodec.c
…
rsoenc.c
…
rtmp.h
…
rtmpcrypt.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
rtmpcrypt.h
…
rtmpdh.c
…
rtmpdh.h
…
rtmphttp.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
rtmppkt.c
…
rtmppkt.h
…
rtmpproto.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
rtp.c
…
rtp.h
…
rtpdec_amr.c
…
rtpdec_asf.c
…
rtpdec_formats.h
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +02:00
rtpdec_g726.c
…
rtpdec_h263_rfc2190.c
…
rtpdec_h263.c
…
rtpdec_h264.c
Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'
2012-08-29 18:04:34 +02:00
rtpdec_ilbc.c
…
rtpdec_jpeg.c
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +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-09-10 14:06:20 +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_xiph: switch to av_assert
2012-08-28 22:29:20 +02:00
rtpenc.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
rtpenc.h
Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'
2012-09-05 14:09:09 +02:00
rtpproto.c
…
rtsp.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
rtsp.h
…
rtspcodes.h
…
rtspdec.c
…
rtspenc.c
…
samidec.c
…
sapdec.c
…
sapenc.c
…
sauce.c
…
sauce.h
…
sbgdec.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
sctp.c
…
sdp.c
Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'
2012-08-29 18:04:34 +02:00
seek-test.c
…
seek.c
…
seek.h
…
segafilm.c
…
segment.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
sierravmd.c
…
siff.c
…
smacker.c
…
smjpeg.c
…
smjpeg.h
…
smjpegdec.c
…
smjpegenc.c
…
smush.c
smush: read subversion for version==1 too.
2012-09-09 02:36:57 +02:00
sol.c
…
sox.h
…
soxdec.c
…
soxenc.c
…
spdif.c
…
spdif.h
…
spdifdec.c
…
spdifenc.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
srtdec.c
…
srtenc.c
matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.
2012-08-31 20:22:49 -07:00
subtitles.c
…
subtitles.h
…
subviewerdec.c
…
swf.c
…
swf.h
…
swfdec.c
…
swfenc.c
…
tcp.c
…
thp.c
…
tiertexseq.c
…
tls.c
…
tmv.c
…
tta.c
…
tty.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
txd.c
…
udp.c
Add 'timeout' option to UDP protocol
2012-08-29 00:28:07 +02:00
url.h
Add 'rw_timeout' into URLContext
2012-08-29 00:05:03 +02:00
urldecode.c
…
urldecode.h
…
utils.c
ffio_read: dont spam the user at EOF with a truncation error
2012-09-08 12:41:57 +02:00
vc1test.c
…
vc1testenc.c
…
version.h
Merge remote-tracking branch 'qatar/master'
2012-09-10 14:06:20 +02:00
voc.c
…
voc.h
…
vocdec.c
…
vocenc.c
…
vorbiscomment.c
…
vorbiscomment.h
…
vqf.c
…
wav.c
Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'
2012-09-05 14:33:32 +02:00
wc3movie.c
…
westwood_aud.c
…
westwood_vqa.c
…
wtv.c
…
wtv.h
…
wtvdec.c
wtvdec: Remove unused strings.h header
2012-09-07 18:24:50 +02:00
wtvenc.c
…
wv.c
…
wvenc.c
…
xa.c
…
xmv.c
…
xwma.c
…
yop.c
…
yuv4mpeg.c
yuv4mpeg: fix potential alignment bug
2012-09-08 13:37:35 +02:00