1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
FFmpeg/libavformat
Michael Niedermayer d0ad91c258 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  os_support: Define SHUT_RD, SHUT_WR and SHUT_RDWR on OS/2
  http: Add support for reading http POST reply headers
  http: Add http_shutdown() for ending writing of posts
  tcp: Allow signalling end of reading/writing
  avio: Add a function for signalling end of reading/writing
  lavfi: fix comment, audio is supported now.
  lavfi: fix incorrect comment.
  lavfi: remove avfilter_null_* from public API on next bump.
  lavfi: remove avfilter_default_* from public API on next bump.
  lavfi: deprecate default config_props() callback and refactor avfilter_config_links()
  avfiltergraph: smarter sample format selection.
  avconv: rename transcode_audio/video to decode_audio/video.
  asyncts: reset delta to 0 when it's not used.
  x86: lavc: use %if HAVE_AVX guards around AVX functions in yasm code.
  dwt: return errors from ff_slice_buffer_init()

Conflicts:
	ffmpeg.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/formats.c
	libavfilter/version.h
	libavfilter/vf_blackframe.c
	libavfilter/vf_drawtext.c
	libavfilter/vf_fade.c
	libavfilter/vf_format.c
	libavfilter/vf_showinfo.c
	libavfilter/video.c
	libavfilter/video.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-05-23 21:48:31 +02:00
..
4xm.c 4xmdemux: Check chunk size 2012-04-16 15:27:39 +02:00
a64.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
aacdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
ac3dec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
act.c
adts.h
adtsenc.c
adxdec.c
aea.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
aiff.h
aiffdec.c Mark truncated packets as corrupt in av_get_packet. 2012-05-01 23:20:52 +02:00
aiffenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
allformats.c Remove libnut wrapper 2012-05-21 08:51:50 +02:00
amr.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
anm.c
apc.c Mark truncated packets as corrupt in av_get_packet. 2012-05-01 23:20:52 +02:00
ape.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
apetag.c
apetag.h
asf.c
asf.h
asfcrypt.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2012-04-07 22:41:37 +02:00
asfenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
assdec.c
assenc.c
au.c Remove some useless code that duplicates av_get_packet. 2012-05-01 23:20:52 +02:00
audiointerleave.c audiointerleave: check timebase 2012-04-01 21:21:13 +02:00
audiointerleave.h
avc.c Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avc.h Merge remote-tracking branch 'qatar/master' 2012-03-25 01:56:53 +01:00
avformat.h avformat: add needs_parsing type to enable codec TS use. 2012-05-22 14:59:02 +02:00
avi.h
avidec.c avidec: simplify avi_read_idx1() 2012-05-23 19:49:25 +02:00
avienc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
avio_internal.h
avio.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
avio.h Merge remote-tracking branch 'qatar/master' 2012-04-19 21:23:52 +02:00
aviobuf.c Merge remote-tracking branch 'qatar/master' 2012-04-28 20:45:06 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bluray.c
bmv.c cosmetics: Align muxer/demuxer declarations 2012-04-06 19:19:59 +03:00
c93.c
cache.c
caf.c
caf.h
cafdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
cafenc.c
cavsvideodec.c
cdg.c cdg: fix pts 2012-05-10 04:17:03 +02:00
cdxl.c
concat.c
crcenc.c
crypto.c
cutils.c
daud.c Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
dfa.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
dv.c Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
dv.h
dvenc.c Merge remote-tracking branch 'qatar/master' 2012-05-08 22:02:59 +02:00
dxa.c
eacdata.c
electronicarts.c Merge remote-tracking branch 'qatar/master' 2012-05-05 20:22:09 +02:00
ffm.h
ffmdec.c ffm: disable adjust_write_index() 2012-05-07 02:42:00 +02:00
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
filmstripdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
filmstripenc.c
flacdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
flacenc_header.c
flacenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
flacenc.h
flic.c
flv.h
flvdec.c flvdec: reenable extradata passing code 2012-05-21 21:19:43 +02:00
flvenc.c Merge remote-tracking branch 'qatar/master' 2012-05-21 23:53:39 +02:00
framecrcenc.c avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps. 2012-05-20 19:50:32 -04:00
framehash.c
g723_1.c
g729dec.c
gif.c
gopher.c
gsmdec.c Remove some useless code that duplicates av_get_packet. 2012-05-01 23:20:52 +02:00
gxf.c
gxf.h
gxfenc.c Merge remote-tracking branch 'qatar/master' 2012-05-14 20:17:24 +02:00
h261dec.c
h263dec.c
h264dec.c
hls.c
hlsproto.c
http.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
http.h
httpauth.c
httpauth.h
icodec.c
id3v1.c
id3v1.h
id3v2.c id3v2: reject APICs with size of 0 2012-05-20 16:29:08 +02:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c Merge remote-tracking branch 'qatar/master' 2012-05-20 22:58:04 +02:00
idroqenc.c Merge remote-tracking branch 'qatar/master' 2012-05-20 22:58:04 +02:00
iff.c Merge remote-tracking branch 'qatar/master' 2012-05-20 22:58:04 +02:00
img2.c lavc: add a OpenEXR decoder 2012-04-06 08:32:09 +02:00
img2dec.c img2dec: remove GLOB_TILDE support. 2012-03-30 05:16:15 +02:00
img2enc.c
ingenientdec.c Remove some useless code that duplicates av_get_packet. 2012-05-01 23:20:52 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
ipmovie.c
isom.c Add Avid Meridien (AVUI) decoder. 2012-05-08 08:41:26 +02:00
isom.h Merge remote-tracking branch 'qatar/master' 2012-04-14 22:37:43 +02:00
iss.c Merge remote-tracking branch 'qatar/master' 2012-05-20 22:58:04 +02:00
iv8.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
ivfdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
ivfenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
jacosubdec.c JACOsub demuxer, decoder and muxer. 2012-05-03 19:37:14 +02:00
jacosubenc.c JACOsub demuxer, decoder and muxer. 2012-05-03 19:37:14 +02:00
jvdec.c jvdec: Make sure there is enough data for the id string. 2012-04-19 21:43:15 +02:00
latmenc.c latmenc: replace per-frame malloc/free by constant size buffer. 2012-04-14 18:21:19 +02:00
libavformat.v
libmodplug.c
libnut.c Remove libnut wrapper 2012-05-21 08:51:50 +02:00
librtmp.c
lmlm4.c
loasdec.c
lxfdec.c lxfdec: support version 1 files, too. 2012-03-31 12:37:42 +02:00
m4vdec.c
Makefile Remove libnut wrapper 2012-05-21 08:51:50 +02:00
matroska.c
matroska.h
matroskadec.c Merge remote-tracking branch 'qatar/master' 2012-04-30 22:18:43 +02:00
matroskaenc.c Merge remote-tracking branch 'qatar/master' 2012-05-21 23:53:39 +02:00
md5enc.c Merge remote-tracking branch 'qatar/master' 2012-05-21 23:53:39 +02:00
md5proto.c
metadata.c
metadata.h
mgsts.c Enable generic index/seeking for mgsts demuxer. 2012-03-26 20:03:57 +02:00
microdvddec.c lavf/microdvd: set packet duration. 2012-04-27 19:19:36 +02:00
microdvdenc.c
mkvtimestamp_v2.c
mm.c mmdemux: dont set pkt->size to an invalid value. 2012-03-23 00:50:49 +01:00
mmf.c Remove some useless code that duplicates av_get_packet. 2012-05-01 23:20:52 +02:00
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c mov: Add missing terminator to mov_ch_layout_map_1ch. 2012-03-22 13:56:44 -07:00
mov_chan.h
mov.c Merge commit '755cd4197d53946208e042f095b930dca18d9430' 2012-05-19 20:31:24 +02:00
movenc.c Read and write APRG mov atom to allow AVUI streamcopy. 2012-05-15 07:41:23 +02:00
movenc.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
movenchint.c
mp3dec.c mp3demux: fix id3 discard code 2012-05-08 03:47:58 +02:00
mp3enc.c lavf/mp3enc: support MPEG-2 and MPEG-2.5 sample rates when writing Xing header. 2012-05-13 16:49:17 +02:00
mpc8.c Skip padding bytes after reading musepack8 header. 2012-05-05 14:46:38 +02:00
mpc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
mpeg.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
mpegts.c mpegts: fix handling of files smaller than 8kb 2012-05-14 02:41:36 +02:00
mpegts.h
mpegtsenc.c mpegtsenc: fix 10l typo, wrong stream 2012-05-11 14:13:07 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c
mtv.c Merge remote-tracking branch 'qatar/master' 2012-05-20 22:58:04 +02:00
mvi.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
mxf.c
mxf.h mxf: Fix frame layout values 2012-04-19 15:08:13 +02:00
mxfdec.c mxfdec: fix frame height computation for mixed fields layout 2012-05-22 15:04:59 +02:00
mxfenc.c mxfenc: Don't allow muxing audio-only since it's not supported 2012-04-03 10:11:27 +02:00
mxg.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
ncdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
network.c
network.h
nsvdec.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
nullenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
nut.c Support yuva422p rawvideo in nut. 2012-05-08 10:37:13 +02:00
nut.h
nutdec.c Add AVFMT_SEEK_TO_PTS to nut demuxer flags 2012-05-16 03:13:35 +02:00
nutenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
nuv.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
oggdec.c ogg: rewrite first timestamp reading code. 2012-05-14 14:15:34 +02:00
oggdec.h
oggenc.c Merge remote-tracking branch 'qatar/master' 2012-04-01 00:36:43 +02:00
oggparsecelt.c
oggparsedirac.c
oggparseflac.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
oggparseogm.c ogm: Fix division by 0 2012-04-18 15:30:34 +02:00
oggparseskeleton.c vorbisdemux: Check private context in theoras gtopts. 2012-03-23 04:29:33 +01:00
oggparsespeex.c
oggparsetheora.c oggtheora: Port changes from oggvorbis timestamp handling. 2012-05-05 00:00:40 +02:00
oggparsevorbis.c oggparsevorbis.c: Check for OOM when using av_mallocz. 2012-05-06 12:00:19 +02:00
oma.c omadec: make sample rate table large enough to prevent out of array reading. 2012-04-16 18:36:39 +02:00
oma.h omadec: make sample rate table large enough to prevent out of array reading. 2012-04-16 18:36:39 +02:00
omadec.c omadec: Check geob datasize more completely 2012-05-10 17:22:27 +02:00
omaenc.c
options_table.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
os_support.c
os_support.h Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
pcm.c
pcm.h
pcmdec.c Mark truncated packets as corrupt in av_get_packet. 2012-05-01 23:20:52 +02:00
pcmenc.c
pmpdec.c
psxstr.c
pva.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
qcp.c
qtpalette.h
r3d.c
rawdec.c rawdec: force timestamps from codec to be used 2012-05-22 14:59:02 +02:00
rawdec.h
rawenc.c Merge remote-tracking branch 'qatar/master' 2012-04-13 00:39:19 +02:00
rawenc.h
rawvideodec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
rdt.c
rdt.h
riff.c aasc: support "Autodesk 24 bit RLE compressor" (FourCC: aas4) 2012-05-16 22:15:59 +02:00
riff.h
rl2.c
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2012-04-20 22:18:26 +02:00
rmenc.c rmenc: more than 2 streams are not currently possible. 2012-04-29 13:03:15 +02:00
rpl.c
rso.c
rso.h
rsodec.c Remove some useless code that duplicates av_get_packet. 2012-05-01 23:20:52 +02:00
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2012-05-19 00:52:25 +02:00
rtp.c
rtp.h
rtpdec_amr.c Merge remote-tracking branch 'qatar/master' 2012-04-08 20:55:11 +02:00
rtpdec_asf.c Merge remote-tracking branch 'qatar/master' 2012-04-08 20:55:11 +02:00
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.c
rtpdec_h264.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
rtpdec_latm.c Merge remote-tracking branch 'qatar/master' 2012-04-08 20:55:11 +02:00
rtpdec_mpeg4.c Merge remote-tracking branch 'qatar/master' 2012-04-08 20:55:11 +02:00
rtpdec_qcelp.c
rtpdec_qdm2.c
rtpdec_qt.c
rtpdec_svq3.c
rtpdec_vp8.c
rtpdec_xiph.c Merge remote-tracking branch 'qatar/master' 2012-04-08 20:55:11 +02:00
rtpdec.c Merge remote-tracking branch 'qatar/master' 2012-04-08 20:55:11 +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.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
rtpenc.h
rtpproto.c
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
rtspcodes.h
rtspdec.c Merge remote-tracking branch 'qatar/master' 2012-04-08 20:55:11 +02:00
rtspenc.c
sapdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
sapenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
sauce.c
sauce.h
sbgdec.c
sctp.c sctp: be consistent with socket option level 2012-05-10 00:01:45 +02:00
sdp.c Merge remote-tracking branch 'qatar/master' 2012-03-29 04:11:10 +02:00
seek-test.c seek-test: support printing multiple packets 2012-05-04 14:40:22 +02:00
seek.c
seek.h
segafilm.c segafilm: make the loop condition in film_read_packet() match the contents. 2012-04-16 02:18:09 +02:00
segment.c Merge remote-tracking branch 'qatar/master' 2012-04-28 20:45:06 +02:00
sierravmd.c
siff.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
smacker.c smackerdemux: Allocate padding for extradata 2012-04-22 11:23:58 +02:00
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c avformat: Add a flag to mark muxers that allow (non strict) monotone timestamps. 2012-05-20 19:50:32 -04:00
sol.c Remove some useless code that duplicates av_get_packet. 2012-05-01 23:20:52 +02:00
sox.h
soxdec.c Remove some useless code that duplicates av_get_packet. 2012-05-01 23:20:52 +02:00
soxenc.c
spdif.c
spdif.h
spdifdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
spdifenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
srtdec.c
swf.h lavf/swf: fix make checkheaders. 2012-05-18 23:34:11 +02:00
swfdec.c swfdec: support compressed swf. 2012-04-03 19:12:52 +02:00
swfenc.c Merge remote-tracking branch 'qatar/master' 2012-05-21 23:53:39 +02:00
tcp.c Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
tta.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
tty.c
txd.c
udp.c udp: check for HAVE_PTHREAD_CANCEL instead of HAVE_PTHREADS. 2012-05-14 19:32:43 +02:00
url.h Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
utils.c lavf: print the invalid tb in avpriv_set_pts_info() 2012-05-23 19:04:23 +02:00
vc1test.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2012-05-21 23:53:39 +02:00
voc.c
voc.h
vocdec.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
vocenc.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c Merge remote-tracking branch 'qatar/master' 2012-05-21 23:53:39 +02:00
wc3movie.c
westwood_aud.c
westwood_vqa.c westwood_vqa: fix SND0 chunk handling 2012-03-27 11:58:15 -04:00
wtv.c
wtv.h
wtvdec.c wtvdec: Check that stream private context has been allocated before use. 2012-04-22 15:29:34 +02:00
wtvenc.c
wv.c
xa.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
xmv.c xmvdemux: prefer av_freep() to deallocate audio stream structs. 2012-04-21 19:42:44 +02:00
xwma.c Merge remote-tracking branch 'qatar/master' 2012-03-22 23:16:49 +01:00
yop.c Merge remote-tracking branch 'qatar/master' 2012-04-06 22:52:01 +02:00
yuv4mpeg.c yuv4mpeg: support 9/10/16 bit pixel formats 2012-05-08 16:53:03 +02:00