RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-11 17:55:21 +00:00
Code Issues Projects Releases Wiki Activity
e37f161e66
ffmpeg/libavformat
History
Michael Niedermayer e37f161e66 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (71 commits)
  movenc: Allow writing to a non-seekable output if using empty moov
  movenc: Support adding isml (smooth streaming live) metadata
  libavcodec: Don't crash in avcodec_encode_audio if time_base isn't set
  sunrast: Document the different Sun Raster file format types.
  sunrast: Add a check for experimental type.
  libspeexenc: use AVSampleFormat instead of deprecated/removed SampleFormat
  lavf: remove disabled FF_API_SET_PTS_INFO cruft
  lavf: remove disabled FF_API_OLD_INTERRUPT_CB cruft
  lavf: remove disabled FF_API_REORDER_PRIVATE cruft
  lavf: remove disabled FF_API_SEEK_PUBLIC cruft
  lavf: remove disabled FF_API_STREAM_COPY cruft
  lavf: remove disabled FF_API_PRELOAD cruft
  lavf: remove disabled FF_API_NEW_STREAM cruft
  lavf: remove disabled FF_API_RTSP_URL_OPTIONS cruft
  lavf: remove disabled FF_API_MUXRATE cruft
  lavf: remove disabled FF_API_FILESIZE cruft
  lavf: remove disabled FF_API_TIMESTAMP cruft
  lavf: remove disabled FF_API_LOOP_OUTPUT cruft
  lavf: remove disabled FF_API_LOOP_INPUT cruft
  lavf: remove disabled FF_API_AVSTREAM_QUALITY cruft
  ...

Conflicts:
	doc/APIchanges
	libavcodec/8bps.c
	libavcodec/avcodec.h
	libavcodec/libx264.c
	libavcodec/mjpegbdec.c
	libavcodec/options.c
	libavcodec/sunrast.c
	libavcodec/utils.c
	libavcodec/version.h
	libavcodec/x86/h264_deblock.asm
	libavdevice/libdc1394.c
	libavdevice/v4l2.c
	libavformat/avformat.h
	libavformat/avio.c
	libavformat/avio.h
	libavformat/aviobuf.c
	libavformat/dv.c
	libavformat/mov.c
	libavformat/utils.c
	libavformat/version.h
	libavformat/wtv.c
	libavutil/Makefile
	libavutil/file.c
	libswscale/x86/input.asm
	libswscale/x86/swscale_mmx.c
	libswscale/x86/swscale_template.c
	tests/ref/lavf/ffm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-01-28 07:53:34 +01:00
..
4xm.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
a64.c
aacdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ac3dec.c
act.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
adts.h
adtsenc.c
adxdec.c lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
aea.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
aiff.h
aiffdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
aiffenc.c
allformats.c Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
amr.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
anm.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
apc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ape.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
apetag.c
apetag.h
applehttp.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
applehttpproto.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
asfenc.c
assdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
assenc.c
au.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
avienc.c
avio_internal.h
avio.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
avio.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
aviobuf.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
avisynth.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
avlanguage.c
avlanguage.h
avs.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
bethsoftvid.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
bfi.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
bink.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
bintext.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
bit.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
bmv.c lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
c93.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
cache.c
caf.c
caf.h
cafdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
cafenc.c cafenc: replace deprecated av_dbl2int() 2012-01-23 17:18:13 +01:00
cavsvideodec.c
cdg.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
concat.c
crcenc.c
crypto.c
cutils.c
daud.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dfa.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
diracdec.c
dnxhddec.c
dsicin.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dtsdec.c
dv.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dv.h
dvenc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
dxa.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
eacdata.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
electronicarts.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ffmenc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ffmeta.h
ffmetadec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ffmetaenc.c
file.c
filmstripdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
filmstripenc.c
flacdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
flacenc_header.c
flacenc.c
flacenc.h
flic.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
flvenc.c
framecrcenc.c
g723_1.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
g729dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
gif.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
gopher.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
gsmdec.c lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
gxf.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
gxf.h
gxfenc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
h261dec.c
h263dec.c
h264dec.c
http.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
http.h
httpauth.c
httpauth.h
icodec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
id3v1.c
id3v1.h
id3v2.c
id3v2.h
id3v2enc.c
idcin.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
idroqdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
idroqenc.c
iff.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
img2.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ingenientdec.c
internal.h
ipmovie.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
isom.c Support decoding Avid DS Uncompressed (SUDS). 2012-01-21 17:58:26 +01:00
isom.h Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
iss.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
iv8.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ivfdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ivfenc.c
jvdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
latmenc.c
libavformat.v buildsys: Fix shared lib build of ffserver. 2012-01-24 17:01:10 +01:00
libmodplug.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
libnut.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
librtmp.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
lmlm4.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
loasdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
lxfdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
m4vdec.c
Makefile Merge remote-tracking branch 'qatar/master' 2012-01-26 02:23:56 +01:00
matroska.c
matroska.h
matroskadec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
matroskaenc.c
md5enc.c
md5proto.c
metadata.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
metadata.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
microdvddec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
microdvdenc.c
mkvtimestamp_v2.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mm.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mmf.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mms.c
mms.h
mmsh.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
mmst.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
mov_chan.c mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions. 2012-01-05 10:34:06 -08:00
mov_chan.h mov: Support MOV_CH_LAYOUT_USE_DESCRIPTIONS for labeled descriptions. 2012-01-05 10:34:06 -08:00
mov.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
movenc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
movenc.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
movenchint.c
mp3dec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mp3enc.c mp3enc: fix playback with mp3 encoded files on some devices. 2012-01-02 15:34:03 +01:00
mpc8.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mpc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mpeg.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mpegts.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mpegts.h
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mtv.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mvi.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mxf.c
mxf.h
mxfdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mxfenc.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
mxg.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
ncdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
network.c
network.h
nsvdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
nullenc.c
nut.c
nut.h
nutdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
nutenc.c
nuv.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
oggdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
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 Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
omaenc.c
options.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
os_support.c
os_support.h
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pmpdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
psxstr.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
pva.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
qcp.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
qtpalette.h
r3d.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rawdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rawdec.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rawenc.c Merge remote-tracking branch 'qatar/master' 2012-01-05 02:03:12 +01:00
rawenc.h
rawvideodec.c
rdt.c
rdt.h
riff.c riff: fix invalid av_freep() calls on EOF in ff_read_riff_info 2012-01-22 19:32:44 +01:00
riff.h
rl2.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rmenc.c Merge remote-tracking branch 'qatar/master' 2012-01-03 03:06:45 +01:00
rpl.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rso.c
rso.h
rsodec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263.c
rtpdec_h264.c
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-01-21 23:11:27 +01:00
rtpdec.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
rtpenc.c
rtpenc.h
rtpproto.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2012-01-23 01:05:20 +01:00
rtspcodes.h
rtspdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
rtspenc.c
sapdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sapenc.c
sauce.c
sauce.h
sbgdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sdp.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
seek-test.c
seek.c
seek.h
segafilm.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
segment.c segment: fix FPE when segment_list_size is 0 2012-01-13 15:57:34 +01:00
sierravmd.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
siff.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
smacker.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
smjpeg.c Merge remote-tracking branch 'qatar/master' 2012-01-17 02:37:30 +01:00
smjpeg.h avformat: split out common SMJPEG code 2012-01-16 11:29:55 +01:00
smjpegdec.c lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
smjpegenc.c add SMJPEG muxer 2012-01-16 11:29:55 +01:00
sol.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
sox.h
soxdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
soxenc.c
spdif.c
spdif.h
spdifdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
spdifenc.c spdifenc: use special alignment for DTS-HD length_code 2012-01-05 16:27:07 -08:00
srtdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
swf.h
swfdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
swfenc.c
tcp.c Merge remote-tracking branch 'qatar/master' 2012-01-06 02:45:12 +01:00
thp.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
tiertexseq.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
tls.c avio: Add an URLProtocol flag for indicating that a protocol uses network 2012-01-05 23:56:52 +02:00
tmv.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
tta.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
tty.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
txd.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
udp.c udp: fix segfault on closing 2012-01-14 17:14:18 +01:00
url.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
vc1test.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
voc.c
voc.h
vocdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
wav.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
wc3movie.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
westwood_aud.c lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
westwood_vqa.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
wtv.c lavf: remove AVFormatParameters from AVFormatContext.read_header signature 2012-01-27 10:51:57 +01:00
wtv.h
wtvdec.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
wtvenc.c
wv.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
xa.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
xmv.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
xwma.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
yop.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00
yuv4mpeg.c Merge remote-tracking branch 'qatar/master' 2012-01-28 07:53:34 +01:00