ffmpeg/libavformat
Michael Niedermayer 4da42ebe44 Merge remote-tracking branch 'qatar/master'
* qatar/master:
  MS Screen 1 decoder
  aacdec: Fix popping channel layouts.
  av_gettime: support Win32 without gettimeofday()
  Use av_gettime() in various places
  Move av_gettime() to libavutil
  dct-test: use emms_c() from libavutil instead of duplicating it
  mov: fix operator precedence bug
  mathematics.h: remove a couple of math defines
  Remove unnecessary inclusions of [sys/]time.h
  lavf: remove unnecessary inclusions of unistd.h
  bfin: libswscale: add const where appropriate to fix warnings
  bfin: libswscale: remove unnecessary #includes
  udp: Properly check for invalid sockets
  tcp: Check the return value from getsockopt
  network: Use av_strerror for getting error messages
  udp: Properly print error from getnameinfo
  mmst: Use AVUNERROR() to convert error codes to the right range for strerror
  network: Pass pointers of the right type to get/setsockopt/ioctlsocket on windows
  rtmp: Reduce the number of idle posts sent by sleeping 50ms

Conflicts:
	Changelog
	configure
	libavcodec/aacdec.c
	libavcodec/allcodecs.c
	libavcodec/avcodec.h
	libavcodec/dct-test.c
	libavcodec/version.h
	libavformat/riff.c
	libavformat/udp.c
	libavutil/Makefile
	libswscale/bfin/yuv2rgb_bfin.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-06-20 20:47:46 +02:00
..
4xm.c 4xm: fix division by zero caused by bps<8 2012-05-29 19:56:07 +02:00
Makefile Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
a64.c
aacdec.c
ac3dec.c ac3_probe: speedup by checking for header earlier 2012-05-31 16:14:27 +02:00
act.c
adtsenc.c Merge remote-tracking branch 'qatar/master' 2012-06-03 02:56:52 +02:00
adxdec.c
aea.c
aiff.h
aiffdec.c Mark truncated packets as corrupt in av_get_packet. 2012-05-01 23:20:52 +02:00
aiffenc.c
allformats.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
amr.c Merge remote-tracking branch 'qatar/master' 2012-06-18 20:07:00 +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 ape: Fix null ptr dereference with files missing a seekatable. 2012-05-29 19:56:07 +02:00
apetag.c
apetag.h
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c asfdec: fix returned error codes 2012-06-14 02:45:11 +02:00
asfenc.c
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.h
avc.c
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
avi.h
avidec.c avidec: add .category 2012-06-19 16:26:01 +00:00
avienc.c avienc: use av_assert 2012-06-17 17:10:05 +02:00
avio.c url: add ffurl_closep() which also sets the context pointer to NULL 2012-06-01 14:47:30 +02:00
avio.h avio: av_protocol_next() is gone 2012-06-20 01:56:03 +00:00
avio_internal.h
aviobuf.c lavf/aviobuf: use av_assert() 2012-06-15 19:44:42 +02:00
avisynth.c Add missing CRLFs to avisynth error messages. 2012-06-05 11:13:30 +02:00
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c bink: check av_mallocz() return value 2012-06-09 10:57:14 +00:00
bintext.c lavf/bintext: allocate FF_INPUT_BUFFER_PADDING_SIZE for extradata 2012-06-09 14:36:41 +02:00
bit.c
bluray.c
bmv.c
c93.c
cache.c
caf.c
caf.h
cafdec.c
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
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c dv-demux: dont mess with codec values 2012-05-31 23:50:08 +02:00
dv.h
dvenc.c timecode: move timecode muxer options to metadata. 2012-06-04 07:41:22 +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 ffmenc: use av_assert 2012-06-16 17:59:01 +02:00
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c file: Fix handling of windows named pipes 2012-06-15 15:05:33 +02:00
filmstripdec.c
filmstripenc.c
flacdec.c Merge remote-tracking branch 'qatar/master' 2012-06-16 23:22:42 +02:00
flacenc.c
flacenc.h
flacenc_header.c
flic.c
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
flvenc.c flvenc: use av_assert instead of assert 2012-06-11 20:14:22 +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 Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
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 timecode: move timecode muxer options to metadata. 2012-06-04 07:41:22 +02:00
h261dec.c
h263dec.c
h264dec.c
hls.c
hlsproto.c
http.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
http.h Merge commit 'f919cc7df6ab844bc12f89fe7bef4fb915a47725' 2012-05-30 01:40:54 +02:00
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
ilbc.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
img2.c
img2dec.c
img2enc.c
ingenientdec.c Remove some useless code that duplicates av_get_packet. 2012-05-01 23:20:52 +02:00
internal.h
ipmovie.c ipmovie_probe: speedup by avoiding memcmp() call 2012-05-31 16:19:26 +02:00
isom.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
isom.h mov: parse tref atom. 2012-06-11 07:35:14 +02:00
iss.c Merge remote-tracking branch 'qatar/master' 2012-05-20 22:58:04 +02:00
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c jacosub_probe: slightly increase the score to limit misdetection. 2012-05-31 22:12:46 +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
libavformat.v
libmodplug.c
libnut.c Remove libnut wrapper 2012-05-21 08:51:50 +02:00
librtmp.c Merge remote-tracking branch 'qatar/master' 2012-06-04 00:33:42 +02:00
lmlm4.c
loasdec.c
lxfdec.c
m4vdec.c
matroska.c
matroska.h
matroskadec.c matroskadec: add assert on lack of overflow in pkt_size+offset 2012-06-15 01:35:52 +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
microdvddec.c lavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error. 2012-06-15 18:40:14 +02:00
microdvdenc.c
mkvtimestamp_v2.c
mm.c
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 Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
mov.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
mov_chan.c mov_chan: Fix operator precedence by adding parentheses 2012-06-17 17:51:50 +03:00
mov_chan.h
movenc.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
movenc.h movenc: add timecode track support. 2012-06-11 07:35:14 +02:00
movenchint.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
mp3dec.c mp3/ac3 probe: search for PES headers to prevent probing MPEG-PS as MP3. 2012-05-30 09:08:29 -07: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
mpc.c
mpc8.c Skip padding bytes after reading musepack8 header. 2012-05-05 14:46:38 +02:00
mpeg.c
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
mpegts.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
mpegts.h
mpegtsenc.c mpegtsenc: use av_assert 2012-06-13 18:51:38 +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
mxf.c
mxf.h mxf: Fix frame layout values 2012-04-19 15:08:13 +02:00
mxfdec.c mxfdec: remove unused last_index_duration 2012-05-27 15:42:45 +02:00
mxfenc.c mxfenc: write optional field dominance flag in picture description 2012-06-06 17:13:28 +02:00
mxg.c
ncdec.c
network.c
network.h Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
nsvdec.c Merge remote-tracking branch 'qatar/master' 2012-05-06 21:53:19 +02:00
nullenc.c
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 nutenc: use av_assert 2012-06-15 19:44:42 +02:00
nuv.c
oggdec.c oggdec: fix regression that caused reading the whole file during open 2012-06-02 22:50:40 +02:00
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c ogm: Fix division by 0 2012-04-18 15:30:34 +02:00
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c oggtheora: Port changes from oggvorbis timestamp handling. 2012-05-05 00:00:40 +02:00
oggparsevorbis.c oggparsevorbis: fix null ptr dereference 2012-05-31 20:25:23 +02:00
oma.c
oma.h
omadec.c omadec: Check geob datasize more completely 2012-05-10 17:22:27 +02:00
omaenc.c
options.c lavf: separate muxer/demuxer class category 2012-06-19 17:22:07 +02:00
options_table.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
os_support.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
os_support.h Merge remote-tracking branch 'qatar/master' 2012-05-23 21:48:31 +02:00
pcm.c
pcm.h
pcmdec.c pcmdec: use av_assert() 2012-06-14 23:52:23 +02:00
pcmenc.c
pmpdec.c
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c
rawdec.c rawdec: use av_assert() 2012-06-14 23:52:40 +02:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c
rdt.h
riff.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
riff.h libavformat: ff_get_bmp_header: return esize too 2012-05-31 00:46:02 +02:00
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
rtmphttp.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
rtmppkt.c Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
rtmppkt.h Merge remote-tracking branch 'qatar/master' 2012-06-15 00:14:21 +02:00
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
rtp.c
rtp.h
rtpdec.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
rtpdec.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
rtpdec_g726.c
rtpdec_h263.c
rtpdec_h263_rfc2190.c rtpdec: Don't require frames to start with a Mode A packet 2012-06-14 22:11:43 +03:00
rtpdec_h264.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
rtpdec_ilbc.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +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
rtpenc.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-06-18 20:07:00 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rtpenc_chain.h Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
rtpenc_h263.c Change all uses of restrict to use av_restrict instead. 2012-06-17 00:38:39 +02:00
rtpenc_h263_rfc2190.c
rtpenc_h264.c Merge remote-tracking branch 'qatar/master' 2012-06-18 20:07:00 +02:00
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpproto.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2012-05-10 02:25:41 +02:00
rtspcodes.h
rtspdec.c
rtspenc.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
sapenc.c Merge remote-tracking branch 'qatar/master' 2012-05-26 22:37:37 +02:00
sauce.c
sauce.h
sbgdec.c
sctp.c Remove unnecessary inclusions of [sys/]time.h 2012-06-20 11:46:46 +01:00
sdp.c Merge remote-tracking branch 'qatar/master' 2012-06-19 20:53:27 +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
segment.c Merge remote-tracking branch 'qatar/master' 2012-06-15 20:56:06 +02:00
sierravmd.c
siff.c
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
spdifenc.c
srtdec.c lavf/{srt,microdvd}: correctly raise error on avformat_new_stream() error. 2012-06-15 18:40:14 +02:00
swf.h lavf/swf: fix make checkheaders. 2012-05-18 23:34:11 +02:00
swfdec.c
swfenc.c swfenc: use av_assert 2012-06-07 21:30:07 +02:00
tcp.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c
udp.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
url.h url: add ffurl_closep() which also sets the context pointer to NULL 2012-06-01 14:47:30 +02:00
utils.c Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
vc1test.c
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2012-06-20 20:47:46 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
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
wtv.c
wtv.h
wtvdec.c libavformat: ff_get_bmp_header: return esize too 2012-05-31 00:46:02 +02:00
wtvenc.c
wv.c
xa.c
xmv.c xmv: use av_assert 2012-06-07 21:09:06 +02:00
xwma.c
yop.c yop_probe: check more fields to avoid detecting random data as yop 2012-05-31 14:47:15 +02:00
yuv4mpeg.c yuv4mpeg: support 9/10/16 bit pixel formats 2012-05-08 16:53:03 +02:00