ffmpeg/libavformat
Michael Niedermayer 6716e6892b Merge remote-tracking branch 'qatar/master'
* qatar/master:
  FATE: Add ZeroCodec test
  oggparseogm: fix order of arguments of avpriv_set_pts_info().
  pngenc: better upper bound for encoded frame size.
  aiffdec: set block_duration to 1 for PCM codecs that are supported in AIFF-C
  aiffdec: factor out handling of integer PCM for AIFF-C and plain AIFF
  aiffdec: use av_get_audio_frame_duration() to set block_duration for AIFF-C
  aiffdec: do not set bit rate if block duration is unknown
  wmall: output packet only if we have decoded some samples

Conflicts:
	libavcodec/pngenc.c
	tests/fate/lossless-video.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-03-22 20:59:58 +01:00
..
4xm.c
Makefile bluray protocol 2012-03-03 04:30:49 +01:00
a64.c
aacdec.c
ac3dec.c
act.c
adts.h
adtsenc.c
adxdec.c
aea.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
aiff.h
aiffdec.c Merge remote-tracking branch 'qatar/master' 2012-03-22 20:59:58 +01:00
aiffenc.c
allformats.c bluray protocol 2012-03-03 04:30:49 +01:00
amr.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
anm.c
apc.c
ape.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
apetag.c Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
apetag.h
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
asfenc.c
assdec.c
assenc.c
au.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
avienc.c
avio.c
avio.h cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
avio_internal.h
aviobuf.c
avisynth.c
avlanguage.c
avlanguage.h
avs.c Merge remote-tracking branch 'qatar/master' 2012-03-03 00:23:10 +01:00
bethsoftvid.c Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
bfi.c
bink.c
bintext.c
bit.c
bluray.c bluray protocol 2012-03-03 04:30:49 +01:00
bmv.c
c93.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
cache.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c cdxl demux: do not create packets with uninitialized data at EOF. 2012-03-05 16:27:31 -05:00
concat.c
crcenc.c
crypto.c
cutils.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c DV demuxer: Stricter check for avio_read result. 2012-03-10 10:43:14 +01:00
dv.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dvenc.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
dxa.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
eacdata.c
electronicarts.c electronicarts vp6: set duration of video stream 2012-03-22 13:15:17 +01:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
ffmenc.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
filmstripdec.c
filmstripenc.c
flacdec.c
flacenc.c
flacenc.h
flacenc_header.c
flic.c
flv.h flv: clarify use of video info/cmd frame. 2012-03-20 07:53:40 +01:00
flvdec.c flv: clarify use of video info/cmd frame. 2012-03-20 07:53:40 +01:00
flvenc.c Revert "flvenc: Remove apparently unneeded AAC check." 2012-03-12 20:42:25 +01:00
framecrcenc.c
framehash.c
g723_1.c
g729dec.c
gif.c Merge remote-tracking branch 'qatar/master' 2012-02-22 02:24:18 +01:00
gopher.c
gsmdec.c
gxf.c gxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet function 2012-03-19 13:33:24 +01:00
gxf.h
gxfenc.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
h261dec.c
h263dec.c
h264dec.c
hls.c Merge remote-tracking branch 'qatar/master' 2012-02-21 05:10:12 +01:00
hlsproto.c Merge remote-tracking branch 'qatar/master' 2012-02-15 01:52:14 +01:00
http.c Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
http.h
httpauth.c Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
httpauth.h Merge remote-tracking branch 'qatar/master' 2012-03-14 02:10:11 +01:00
icodec.c
id3v1.c
id3v1.h
id3v2.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
id3v2.h Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
id3v2enc.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
idcin.c
idroqdec.c
idroqenc.c
iff.c Merge remote-tracking branch 'qatar/master' 2012-03-13 01:56:33 +01:00
img2.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
img2dec.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
img2enc.c Merge remote-tracking branch 'qatar/master' 2012-03-18 23:39:42 +01:00
ingenientdec.c
internal.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
ipmovie.c
isom.c Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
isom.h Merge remote-tracking branch 'qatar/master' 2012-02-23 04:31:55 +01:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c Merge remote-tracking branch 'qatar/master' 2012-03-15 01:27:10 +01:00
latmenc.c
libavformat.v libavformat.v: add ffio_set_buf_size() for ffserver. 2012-03-12 06:04:37 +01:00
libmodplug.c
libnut.c
librtmp.c Merge remote-tracking branch 'qatar/master' 2012-02-15 01:52:14 +01:00
lmlm4.c
loasdec.c
lxfdec.c
m4vdec.c
matroska.c
matroska.h Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
matroskadec.c matroskadec: Fix null pointer exception on corrupted input. 2012-03-16 05:28:18 +01:00
matroskaenc.c matroskaenc: change cluster_pos to use -1 as the "I'm not currently working on a cluster" signal instead of 0. 2012-03-14 21:51:38 +01:00
md5enc.c
md5proto.c
metadata.c
metadata.h
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c Fix type and codetype fields in the MMF header for some phones. 2012-03-21 22:19:23 +01:00
mms.c
mms.h
mmsh.c
mmst.c
mov.c mov: Discard invalid CTTS. 2012-03-08 21:31:45 +01:00
mov_chan.c
mov_chan.h doxygen: Remove documentation for non-existing parameters; misc small fixes. 2012-02-28 20:48:43 +01:00
movenc.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
movenc.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
movenchint.c Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
mp3dec.c mp3_probe: consider id3 tags to be low scoring mp3. 2012-03-19 20:49:04 +01:00
mp3enc.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
mpc.c
mpc8.c
mpeg.c
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
mpegts.c Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
mpegts.h Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
mpegvideodec.c mpegvideo_probe: Fix misdetection of mpeg4video files. 2012-03-09 22:25:32 +01:00
mpjpeg.c mpjpeg: video streaming will no longer break and stop on Firefox 2012-03-10 18:32:02 +01:00
msnwc_tcp.c
mtv.c
mvi.c
mxf.c mxf: Add DNxHD UL 2012-03-10 18:01:03 +01:00
mxf.h Fix frame height vs field height confusion in MXF decoding. 2012-03-11 17:39:52 +01:00
mxfdec.c mxfdec: Only parse next partition pack if parsing forward 2012-03-20 13:45:19 +01:00
mxfenc.c
mxg.c
ncdec.c
network.c
network.h
nsvdec.c
nullenc.c
nut.c
nut.h
nutdec.c
nutenc.c
nuv.c cosmetics: fix some typos 2012-03-13 01:14:04 +01:00
oggdec.c Merge remote-tracking branch 'qatar/master' 2012-03-09 01:22:31 +01:00
oggdec.h
oggenc.c Merge remote-tracking branch 'qatar/master' 2012-02-25 04:00:43 +01:00
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c oggparseogm: fix order of arguments of avpriv_set_pts_info(). 2012-03-22 19:51:43 +01:00
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c ogg: don't set codec timebase 2012-03-02 11:11:38 +01:00
oggparsevorbis.c oggdec: output correct timestamps for Vorbis 2012-03-20 14:39:57 -04:00
oma.c
oma.h
omadec.c oma: Fix out of array read. 2012-03-18 15:01:58 -07:00
omaenc.c id3v2enc: split ff_id3v2_write(). 2012-02-29 14:26:14 +01:00
options.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
options_table.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
os_support.c Allow other programs to open the same files on Windows. 2012-02-18 12:26:35 +01:00
os_support.h
pcm.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcm.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcmdec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
pcmenc.c
pmpdec.c pmpdec: Check for zero audio packets. 2012-02-28 07:20:36 +01:00
psxstr.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
pva.c
qcp.c
qtpalette.h
r3d.c Merge remote-tracking branch 'qatar/master' 2012-03-10 01:12:08 +01:00
rawdec.c rawdec: set timebase to 1/fps. 2012-02-26 07:30:21 +01:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
rdt.h
riff.c ZeroCodec Decoder 2012-03-19 19:02:23 +01:00
riff.h
rl2.c Merge remote-tracking branch 'qatar/master' 2012-02-29 00:30:35 +01:00
rm.c Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
rmenc.c
rpl.c
rso.c
rso.h
rsodec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
rtmpproto.c
rtp.c Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
rtp.h Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
rtpdec.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
rtpdec.h
rtpdec_amr.c
rtpdec_asf.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
rtpdec_formats.h Merge remote-tracking branch 'qatar/master' 2012-02-19 01:47:10 +01:00
rtpdec_g726.c
rtpdec_h263.c Merge remote-tracking branch 'qatar/master' 2012-02-19 01:47:10 +01:00
rtpdec_h263_rfc2190.c rtpdec: Identify incorrectly signalled H263 2012-02-18 17:31:55 +02:00
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
rtpenc.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263.c Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
rtpenc_h263_rfc2190.c rtpenc: Use MB info side data for splitting H263 packets for RFC 2190 2012-03-01 16:08:32 +02:00
rtpenc_h264.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpproto.c Merge remote-tracking branch 'qatar/master' 2012-02-17 00:35:06 +01:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
rtsp.h
rtspcodes.h
rtspdec.c Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
rtspenc.c Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c sbgdec: read_seek was undeprecated. 2012-02-23 16:00:22 +01:00
sdp.c Merge remote-tracking branch 'qatar/master' 2012-02-24 02:57:18 +01:00
seek-test.c
seek.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
seek.h Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
segafilm.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
segment.c segment: fix null pointer dereference 2012-03-22 13:43:26 +01:00
sierravmd.c
siff.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
smacker.c Merge remote-tracking branch 'qatar/master' 2012-03-08 02:51:45 +01:00
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
sol.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
sox.h
soxdec.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
swf.h
swfdec.c Merge remote-tracking branch 'qatar/master' 2012-03-01 03:17:11 +01:00
swfenc.c Merge remote-tracking branch 'qatar/master' 2012-03-06 06:03:32 +01:00
tcp.c
thp.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
tiertexseq.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
tls.c
tmv.c
tta.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
tty.c
txd.c
udp.c udp: lock all operations on shared variables. 2012-03-22 17:36:23 +01:00
url.h Merge remote-tracking branch 'qatar/master' 2012-03-20 00:03:19 +01:00
utils.c Print a warning when using wild guesses as time stamps. 2012-03-21 20:15:31 +01:00
vc1test.c
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
voc.c
voc.h Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
vocdec.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c Merge remote-tracking branch 'qatar/master' 2012-03-04 04:26:04 +01:00
wav.c Merge remote-tracking branch 'qatar/master' 2012-02-16 01:34:37 +01:00
wc3movie.c
westwood_aud.c
westwood_vqa.c westwood_vqa: set video stream duration 2012-03-21 18:09:27 +01:00
wtv.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
xa.c Merge remote-tracking branch 'qatar/master' 2012-03-21 01:33:53 +01:00
xmv.c
xwma.c
yop.c
yuv4mpeg.c