RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
ffmpeg/libavformat
History
Michael Niedermayer d2084402e6 Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  lavc: fix type for thread_type option
  avconv: move format to options context
  avconv: move limit_filesize to options context
  avconv: move start_time, recording_time and input_ts_offset to options context
  avconv: add a context for options.
  cmdutils: allow storing per-stream/chapter/.... options in a generic way
  cmdutils: split per-option code out of parse_options().
  cmdutils: add support for caller-provided option context.
  cmdutils: declare only one pointer type in OptionDef
  cmdutils: move grow_array() from avconv to cmdutils.
  cmdutils: move exit_program() declaration to cmdutils from avconv
  http: Consider the stream as seekable if the reply contains Accept-Ranges: bytes
  nutenc: add namespace to the api facing functions

Conflicts:
	avconv.c
	cmdutils.c
	cmdutils.h
	ffmpeg.c
	ffplay.c
	ffprobe.c
	ffserver.c
	libavformat/http.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
 		2011-09-05 03:10:45 +02:00
..
4xm.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
Makefile Add LOAS demuxer. 2011-08-20 00:27:38 +02:00
a64.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
aacdec.c Limit fsize before adding to pointer. 2011-07-31 19:40:08 +02:00
ac3dec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
adts.h
…
adtsenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
aea.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
aiff.h
…
aiffdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
aiffenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
allformats.c Add LOAS demuxer. 2011-08-20 00:27:38 +02:00
amr.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
anm.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
apc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ape.c Merge remote-tracking branch 'qatar/master' 2011-07-26 15:37:22 +02:00
apetag.c
…
apetag.h
…
applehttp.c Merge remote-tracking branch 'qatar/master' 2011-08-04 20:59:36 +02:00
applehttpproto.c
…
asf.c
…
asf.h
…
asfcrypt.c Merge remote-tracking branch 'qatar/master' 2011-06-24 03:07:04 +02:00
asfcrypt.h
…
asfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
asfenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
assdec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
assenc.c
…
au.c Support streaming .au files. 2011-08-14 00:05:36 +02:00
audiointerleave.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
avi.c
…
avi.h
…
avidec.c Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925' 2011-08-13 02:56:08 +02:00
avienc.c Merge remote-tracking branch 'qatar/master' 2011-08-22 15:00:53 +02:00
avio.c
…
avio.h Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
avio_internal.h
…
aviobuf.c Merge remote-tracking branch 'qatar/master' 2011-07-16 19:43:35 +02:00
avisynth.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
avlanguage.c
…
avlanguage.h
…
avs.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
bethsoftvid.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
bfi.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
bink.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
c93.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
caf.c Cosmetics: Restore alphabetical order. 2011-08-01 00:58:49 +02:00
caf.h
…
cafdec.c Use little endian for caf codec tags. 2011-07-24 23:52:42 +02:00
cafenc.c Support more codecs when muxing caf. 2011-08-22 09:35:58 +02:00
cavsvideodec.c
…
cdg.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
concat.c
…
crcenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
crypto.c
…
cutils.c
…
daud.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dfa.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
diracdec.c
…
dnxhddec.c
…
dsicin.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dtsdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
dv.h
…
dvenc.c fifo: add av_fifo_peek2(), and deprecate av_fifo_peek() 2011-08-26 20:53:02 +02:00
dxa.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
eacdata.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
electronicarts.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ffm.h Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
ffmdec.c Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
ffmenc.c Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
ffmeta.h
…
ffmetadec.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
ffmetaenc.c
…
file.c
…
filmstripdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
filmstripenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flacdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flacenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flacenc.h
…
flacenc_header.c
…
flic.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flv.h Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
flvdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
flvenc.c flvenc: use avcodec_get_name to report unsupported codecs. 2011-08-22 12:13:27 +02:00
framecrcenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
gif.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
gopher.c
…
gxf.c Warn when falling back to unreliable UMF fps tag. 2011-08-03 20:06:38 +02:00
gxf.h
…
gxfenc.c Merge remote-tracking branch 'qatar/master' 2011-07-18 16:43:46 +02:00
h261dec.c
…
h263dec.c
…
h264dec.c
…
http.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
http.h
…
httpauth.c
…
httpauth.h
…
id3v1.c
…
id3v1.h
…
id3v2.c
…
id3v2.h
…
idcin.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
idroqdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
idroqenc.c
…
iff.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
img2.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
ingenientdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
internal.h Merge commit 'b5849f77095439e994b11c25e6063d443b36c228' 2011-07-14 02:24:10 +02:00
ipmovie.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
isom.c Support Nellymoser in isom. 2011-08-30 10:46:51 +02:00
isom.h Merge remote-tracking branch 'qatar/master' 2011-08-26 01:29:40 +02:00
iss.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
iv8.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ivfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
ivfenc.c
…
jvdec.c
…
libavformat.v
…
libnut.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
librtmp.c Merge remote-tracking branch 'qatar/master' 2011-07-06 01:34:08 +02:00
lmlm4.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
loasdec.c Add LOAS demuxer. 2011-08-20 00:27:38 +02:00
lxfdec.c
…
m4vdec.c
…
matroska.c
…
matroska.h
…
matroskadec.c matroskadec: use correct compression parameters for current track CodecPrivate 2011-08-18 00:21:21 +02:00
matroskaenc.c Do not set codec_tag property for matroska muxers. 2011-08-28 23:13:17 +02:00
md5enc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
md5proto.c
…
metadata.c
…
metadata.h
…
microdvddec.c
…
microdvdenc.c
…
mm.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mmf.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mms.c
…
mms.h
…
mmsh.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
mmst.c
…
mov.c mov: read tmcd tag and set timecode drop flag accordingly. 2011-08-30 09:14:05 +02:00
movenc.c Merge remote-tracking branch 'qatar/master' 2011-08-22 15:00:53 +02:00
movenc.h
…
movenchint.c Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf' 2011-07-11 04:23:25 +02:00
mp3dec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mp3enc.c Do not assume timestamps for mp2 format. 2011-08-28 21:43:04 +02:00
mpc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpc8.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpeg.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mpeg.h
…
mpegenc.c Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-09-01 01:31:03 +02:00
mpegts.c Only autodetect loas in transport streams. 2011-08-30 10:46:51 +02:00
mpegts.h
…
mpegtsenc.c Add support for BDAV/m2ts-mode muxing 2011-08-27 23:57:24 +02:00
mpegvideodec.c
…
mpjpeg.c Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
msnwc_tcp.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mtv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mvi.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
mxf.c mxf: H.264/MPEG-4 AVC Intra support 2011-08-15 00:40:54 +02:00
mxf.h
…
mxfdec.c Parse MXF partitions 2011-09-02 20:40:54 +02:00
mxfenc.c mxf: honor timecode drop flag in mxf muxer if set. 2011-08-13 19:13:02 +02:00
mxg.c
…
ncdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
network.h
…
nsvdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
nullenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
nut.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
nut.h
…
nutdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
nutenc.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
nuv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
oggdec.c oggdec: subtract time of first packet only from duration when it is significant 2011-08-24 23:20:09 +02:00
oggdec.h oggdec: Make sure start time correction is applied once to each stream 2011-08-24 23:13:57 +02:00
oggenc.c oggenc: add missing initializer braces to shut up gcc warning. 2011-08-10 21:03:39 +02:00
oggparsecelt.c
…
oggparsedirac.c
…
oggparseflac.c
…
oggparseogm.c
…
oggparseskeleton.c
…
oggparsespeex.c
…
oggparsetheora.c
…
oggparsevorbis.c
…
oma.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
os_support.c
…
os_support.h
…
pcm.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
pcm.h
…
pcmdec.c
…
pcmenc.c
…
pmpdec.c
…
psxstr.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
pva.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
qcp.c Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
qtpalette.h
…
r3d.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rawdec.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
rawdec.h
…
rawenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rawenc.h
…
rawvideodec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rdt.c
…
rdt.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
riff.c Support speex in avi. 2011-08-30 23:45:39 +02:00
riff.h
…
rl2.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rm.c
…
rm.h
…
rmdec.c Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-09-01 01:31:03 +02:00
rmenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rpl.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
rso.c
…
rso.h
…
rsodec.c
…
rsoenc.c
…
rtmp.h
…
rtmppkt.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtmppkt.h Merge remote-tracking branch 'qatar/master' 2011-07-03 03:14:10 +02:00
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
rtp.c
…
rtp.h
…
rtpdec.c Merge remote-tracking branch 'qatar/master' 2011-07-22 12:08:52 +02:00
rtpdec.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
…
rtpdec_svq3.c Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
rtpdec_vp8.c Merge remote-tracking branch 'qatar/master' 2011-07-15 17:51:09 +02:00
rtpdec_xiph.c
…
rtpenc.c rtpenc: use avcodec_get_name to report unsupported codecs. 2011-08-22 12:13:27 +02:00
rtpenc.h
…
rtpenc_aac.c
…
rtpenc_amr.c
…
rtpenc_chain.c
…
rtpenc_chain.h
…
rtpenc_h263.c
…
rtpenc_h264.c
…
rtpenc_latm.c
…
rtpenc_mpv.c
…
rtpenc_vp8.c
…
rtpenc_xiph.c
…
rtpproto.c rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API. 2011-07-25 16:37:12 +02:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2011-07-19 18:46:04 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2011-07-19 18:46:04 +02:00
rtspcodes.h
…
rtspdec.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
rtspenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sapenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sauce.c
…
sauce.h
…
sdp.c
…
seek-test.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
seek.c Merge remote-tracking branch 'qatar/master' 2011-07-04 00:45:21 +02:00
seek.h
…
segafilm.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sierravmd.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
siff.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
smacker.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sol.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
sox.h
…
soxdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
soxenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
spdif.c
…
spdif.h
…
spdifdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
spdifenc.c Cosmetics: Fix indentation. 2011-08-01 00:58:49 +02:00
srtdec.c
…
swf.h
…
swfdec.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
swfenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
tcp.c
…
thp.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
tiertexseq.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
timefilter.c
…
timefilter.h
…
tmv.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
tta.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
tty.c Merge remote-tracking branch 'qatar/master' 2011-08-15 23:35:53 +02:00
txd.c
…
udp.c udp: fix circular buffer error handling 2011-08-25 21:43:30 +02:00
url.h Merge remote-tracking branch 'qatar/master' 2011-07-14 20:44:58 +02:00
utils.c Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-09-01 01:31:03 +02:00
vc1test.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
vc1testenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
version.h Merge remote-tracking branch 'qatar/master' 2011-09-04 04:11:53 +02:00
voc.c
…
voc.h
…
vocdec.c vocdec: Take channel count into account when calculating bit rate. 2011-08-27 22:12:51 +02:00
vocenc.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
vorbiscomment.c
…
vorbiscomment.h
…
vqf.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
wav.c wav: init st to NULL to avoid a false-positive warning. 2011-09-01 20:23:40 +02:00
wc3movie.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
westwood.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
wtv.c doxygen: Fix parameter names to match the function prototypes. 2011-07-03 18:30:02 +02:00
wtv.h
…
wtvdec.c wtvdec: also support big-sectors when fat depth is zero 2011-07-15 16:57:35 +02:00
wv.c Merge remote-tracking branch 'qatar/master' 2011-08-21 15:27:02 +02:00
xa.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
xmv.c xmv: eliminate superfluous zeroing of zero data 2011-08-26 16:26:57 +02:00
xwma.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
yop.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00
yuv4mpeg.c Merge remote-tracking branch 'qatar/master' 2011-07-17 20:12:02 +02:00