RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-24 08:12:44 +00:00
Code Issues Projects Releases Wiki Activity
ac627b3d38
ffmpeg/libavformat
History
Michael Niedermayer ac627b3d38 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 
* commit '716d413c13981da15323c7a3821860536eefdbbb':
  Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

Conflicts:
	doc/examples/muxing.c
	ffmpeg.h
	ffmpeg_filter.c
	ffmpeg_opt.c
	ffplay.c
	ffprobe.c
	libavcodec/8bps.c
	libavcodec/aasc.c
	libavcodec/aura.c
	libavcodec/avcodec.h
	libavcodec/avs.c
	libavcodec/bfi.c
	libavcodec/bmp.c
	libavcodec/bmpenc.c
	libavcodec/c93.c
	libavcodec/cscd.c
	libavcodec/cyuv.c
	libavcodec/dpx.c
	libavcodec/dpxenc.c
	libavcodec/eatgv.c
	libavcodec/escape124.c
	libavcodec/ffv1.c
	libavcodec/flashsv.c
	libavcodec/fraps.c
	libavcodec/h264.c
	libavcodec/huffyuv.c
	libavcodec/iff.c
	libavcodec/imgconvert.c
	libavcodec/indeo3.c
	libavcodec/kmvc.c
	libavcodec/libopenjpegdec.c
	libavcodec/libopenjpegenc.c
	libavcodec/libx264.c
	libavcodec/ljpegenc.c
	libavcodec/mjpegdec.c
	libavcodec/mjpegenc.c
	libavcodec/motionpixels.c
	libavcodec/mpeg12.c
	libavcodec/mpeg12enc.c
	libavcodec/mpeg4videodec.c
	libavcodec/mpegvideo_enc.c
	libavcodec/pamenc.c
	libavcodec/pcxenc.c
	libavcodec/pgssubdec.c
	libavcodec/pngdec.c
	libavcodec/pngenc.c
	libavcodec/pnm.c
	libavcodec/pnmdec.c
	libavcodec/pnmenc.c
	libavcodec/ptx.c
	libavcodec/qdrw.c
	libavcodec/qpeg.c
	libavcodec/qtrleenc.c
	libavcodec/raw.c
	libavcodec/rawdec.c
	libavcodec/rl2.c
	libavcodec/sgidec.c
	libavcodec/sgienc.c
	libavcodec/snowdec.c
	libavcodec/snowenc.c
	libavcodec/sunrast.c
	libavcodec/targa.c
	libavcodec/targaenc.c
	libavcodec/tiff.c
	libavcodec/tiffenc.c
	libavcodec/tmv.c
	libavcodec/truemotion2.c
	libavcodec/utils.c
	libavcodec/vb.c
	libavcodec/vp3.c
	libavcodec/wnv1.c
	libavcodec/xl.c
	libavcodec/xwddec.c
	libavcodec/xwdenc.c
	libavcodec/yop.c
	libavdevice/v4l2.c
	libavdevice/x11grab.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/buffersrc.c
	libavfilter/drawutils.c
	libavfilter/formats.c
	libavfilter/src_movie.c
	libavfilter/vf_ass.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_hflip.c
	libavfilter/vf_lut.c
	libavfilter/vf_overlay.c
	libavfilter/vf_pad.c
	libavfilter/vf_scale.c
	libavfilter/vf_transpose.c
	libavfilter/vf_yadif.c
	libavfilter/video.c
	libavfilter/vsrc_testsrc.c
	libavformat/movenc.c
	libavformat/mxf.h
	libavformat/utils.c
	libavformat/yuv4mpeg.c
	libavutil/imgutils.c
	libavutil/pixdesc.c
	libswscale/input.c
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/x86/swscale_template.c
	libswscale/x86/yuv2rgb.c
	libswscale/x86/yuv2rgb_template.c
	libswscale/yuv2rgb.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-10-08 21:06:57 +02:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adtsenc.c
adxdec.c
aea.c
aiff.h
aiffdec.c isom: fix redundant redeclaration of ff_mov_read_chan(). 2012-10-02 00:26:15 +02:00
aiffenc.c
allformats.c TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
apetagenc.c
asf.c
asf.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
asfenc.c asfenc: avoid negative timestamps 2012-09-28 02:40:53 +02:00
assdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
assenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
au.c
audiointerleave.c
audiointerleave.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
avc.c
avc.h
avformat.h avformat: fix typo in comment 2012-10-07 17:57:13 +00:00
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
avienc.c avformat: Remove non-compiling and/or silly commented-out printf/av_log statements 2012-10-01 10:24:28 +02:00
avio_internal.h
avio.c
avio.h Merge remote-tracking branch 'qatar/master' 2012-09-28 05:11:19 +02:00
aviobuf.c avio: flush the internal buffer in avio_close() 2012-09-15 18:24:49 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
bink.c
bintext.c
bit.c
bluray.c
bmv.c Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat 2012-10-08 07:13:26 +02:00
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c
concat.c
crcenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
crypto.c
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c
dv.h
dvenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
dxa.c
eacdata.c
electronicarts.c
ffm.h ffserver: fix seeking with ?date=... 2012-10-08 09:03:19 +02:00
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-10-07 11:28:38 +02:00
ffmenc.c ffserver: fix seeking with ?date=... 2012-10-08 09:03:19 +02:00
ffmeta.h
ffmetadec.c
ffmetaenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
file.c file: set the return value type for lseek to off_t 2012-09-27 01:47:49 +02:00
filmstripdec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
filmstripenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
flacdec.c
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2012-09-11 15:24:22 +02:00
flvenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
framecrcenc.c framecrcenc: print flags and side data elements 2012-10-03 16:51:30 +02:00
framehash.c
g723_1.c
g729dec.c
gif.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
gopher.c
gsmdec.c
gxf.c Merge remote-tracking branch 'qatar/master' 2012-10-08 13:11:11 +02:00
gxf.h
gxfenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
h261dec.c
h263dec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
h264dec.c Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b' 2012-10-04 13:11:45 +02:00
hls.c hls: Disable http seekability probing 2012-10-05 05:15:55 +02:00
hlsproto.c
http.c http: prevent the Range header being sent when seekability probing isnt used 2012-10-05 05:13:28 +02:00
http.h
httpauth.c
httpauth.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
icodec.c
icoenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
id3v1.c
id3v1.h
id3v2.c id3v2: strdup the genre name explicitly. 2012-09-17 15:48:20 +02:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ilbc.c
img2.c
img2dec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
img2enc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
ingenientdec.c
internal.h mux/nut: factorize ff_choose_timebase() out of nut 2012-10-03 21:34:43 +02:00
ipmovie.c
isom.c Pinnacle TARGA CineWave YUV16 decoder (fourcc Y216). 2012-10-06 06:20:52 +02:00
isom.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v libavformat.v: export ffurl_protocol_next 2012-09-13 16:21:25 +02:00
libmodplug.c
libnut.c
librtmp.c
lmlm4.c
loasdec.c
lxfdec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
m4vdec.c
Makefile TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
matroska.c Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013' 2012-09-20 19:43:38 +02:00
matroska.h lavf/mkv: prefix video stereo arrays with ff_. 2012-09-16 02:58:40 +02:00
matroskadec.c Merge remote-tracking branch 'qatar/master' 2012-09-21 14:44:32 +02:00
matroskaenc.c matroskaenc: remove MATROSKA_ID_VIDEODISPLAYUNIT 3 2012-10-07 12:48:31 +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 Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
mmsh.c
mmst.c
mov_chan.c
mov_chan.h
mov.c mov: fix integer avoption types 2012-10-07 03:20:36 +02:00
movenc.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
movenc.h movenc: support an alternative to edit lists to handle the first DTS != 0 case. 2012-10-07 06:04:40 +02:00
movenchint.c
mp3dec.c mp3dec: fix seeking without xing TOC 2012-09-20 22:00:52 +02:00
mp3enc.c mp3enc: merge mp2/mp3_write_trailer 2012-09-16 14:37:50 +02:00
mpc8.c
mpc.c
mpeg.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpegts.c mpegts: fuzzy crc check for not so spec compliant files 2012-10-08 05:25:27 +02:00
mpegts.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c
mtv.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
mux.c mux: change 1 assert->av_assert1() 2012-10-07 23:31:27 +02:00
mvi.c
mxf.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
mxf.h Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
mxfdec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
mxfenc.c mxfenc: fix av_log data type for dts paramater 2012-10-08 02:08:28 +02:00
mxg.c
ncdec.c
network.c
network.h
nsvdec.c nsvdec: change 2 commented assert() to av_assert() 2012-09-18 05:08:32 +02:00
nullenc.c
nut.c
nut.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
nutdec.c Merge remote-tracking branch 'qatar/master' 2012-10-02 19:48:54 +02:00
nutenc.c mux/nut: factorize ff_choose_timebase() out of nut 2012-10-03 21:34:43 +02:00
nuv.c
oggdec.c Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8' 2012-09-25 16:00:09 +02:00
oggdec.h oggdec: add missing () for OGG_NOGRANULE_VALUE 2012-09-25 16:03:55 +02:00
oggenc.c Merge remote-tracking branch 'qatar/master' 2012-09-28 05:11:19 +02:00
oggparsecelt.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparsedirac.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseflac.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseogm.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oggparseopus.c
oggparseskeleton.c Merge commit 'd1f05dd18375f2f8e68372edee11436927e43ba8' 2012-09-25 16:00:09 +02:00
oggparsespeex.c ogg: check that the expected number of headers had been parsed 2012-09-24 22:35:29 +02:00
oggparsetheora.c oggparsetheora: fix comment header parsing 2012-10-05 18:07:13 +02:00
oggparsevorbis.c Merge commit '7751e4693dd10ec98c20fbd9887233b575034272' 2012-09-25 15:15:16 +02:00
oma.c
oma.h
omadec.c
omaenc.c
options_table.h lavf: Add support offset timestamps on muxing. 2012-09-26 15:55:16 +02:00
options.c
os_support.c
os_support.h Merge remote-tracking branch 'qatar/master' 2012-09-13 15:35:50 +02:00
paf.c
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pmpdec.c
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c
rawdec.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c
riff.c bitmap header lookup: add code comment 2012-09-23 02:12:34 +02:00
riff.h
rl2.c
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
rmenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c
rtmppkt.h
rtmpproto.c rtmpproto: reorder some expressions to fix compilation with clang without optimizations 2012-09-12 05:17:52 +02:00
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.c
rtpdec_h264.c
rtpdec_ilbc.c
rtpdec_jpeg.c Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b' 2012-09-13 15:22:16 +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 Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
rtpdec.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpdec.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_jpeg.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c Merge remote-tracking branch 'qatar/master' 2012-09-27 14:29:03 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-09-24 13:54:24 +02:00
rtpproto.c
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
seek-test.c
seek.c
seek.h
segafilm.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
segment.c segment: reverse pass avoid_negative_ts from the muxer 2012-10-06 12:07:26 +02:00
sierravmd.c
siff.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
smacker.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
smoothstreamingenc.c Merge remote-tracking branch 'qatar/master' 2012-10-07 11:28:38 +02:00
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
srtenc.c
subtitles.c
subtitles.h
subviewerdec.c
swf.c
swf.h Merge remote-tracking branch 'qatar/master' 2012-10-06 13:45:08 +02:00
swfdec.c Merge remote-tracking branch 'qatar/master' 2012-10-01 16:12:38 +02:00
swfenc.c Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b' 2012-09-16 14:24:11 +02:00
takdec.c TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
tcp.c
thp.c
tiertexseq.c
tls.c
tmv.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
tta.c
tty.c
txd.c
udp.c udp: pick params from AVOptions also 2012-09-15 22:13:21 +02:00
url.h
urldecode.c
urldecode.h
utils.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
vc1test.c
vc1testenc.c
version.h TAK demuxer, decoder and parser 2012-10-08 09:06:25 +00:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c wav: Fix DTS detection 2012-09-23 01:22:16 +02:00
wc3movie.c
webvttdec.c WebVTT demuxer and decoder. 2012-09-23 15:24:08 +02:00
westwood_aud.c
westwood_vqa.c
wtv.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
wvenc.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.c Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00