ffmpeg/libavformat
Michael Niedermayer a7758884db Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtp: factorize  dynamic payload type fallback
  flvdec: Ignore the index if it's from a creator known to be different
  cmdutils: move grow_array out of #if CONFIG_AVFILTER
  avconv: actually set InputFile.rate_emu
  ratecontrol: update last_qscale_for sooner
  Fix unnecessary shift with 9/10bit vertical scaling
  prores: mark prores as intra-only in libavformat/utils.c:is_intra_only()
  prores: return more meaningful error values
  prores: improve error message wording
  prores: cosmetics: prettyprinting, drop useless parentheses
  prores: lowercase AVCodec name entry

Conflicts:
	cmdutils.c
	libavcodec/proresdec_lgpl.c
	tests/ref/lavfi/pixfmts_scale

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-09-24 01:03:07 +02:00
..
4xm.c
Makefile Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
a64.c
aacdec.c Limit fsize before adding to pointer. 2011-07-31 19:40:08 +02:00
ac3dec.c
adts.h
adtsenc.c
aea.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
amr.c
anm.c
apc.c
ape.c ape demuxer: fix segfault on memory allocation failure. 2011-09-12 21:12:31 +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
asfcrypt.h
asfdec.c asf: only try to read asf index once 2011-09-12 22:12:14 +02:00
asfenc.c asfenc: fix assert failure on long ffserver runs 2011-09-09 03:34:27 +02:00
assdec.c
assenc.c
au.c Support streaming .au files. 2011-08-14 00:05:36 +02:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h Minor documentation clarification regarding AVStream.start_time semantics 2011-09-23 04:21:02 +02:00
avi.c
avi.h
avidec.c avidec: Check return value of more avio_seek calls 2011-09-12 04:39:12 +02:00
avienc.c Merge remote-tracking branch 'qatar/master' 2011-08-22 15:00:53 +02:00
avio.c
avio.h
avio_internal.h
aviobuf.c
avisynth.c avisynth: Fix upside down bug 2011-09-10 05:24:39 +02:00
avlanguage.c Merge remote-tracking branch 'qatar/master' 2011-09-08 22:37:31 +02:00
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c [bink] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
bintext.c Binary text decoder 2011-09-16 05:53:14 +02:00
c93.c
caf.c Cosmetics: Restore alphabetical order. 2011-08-01 00:58:49 +02:00
caf.h
cafdec.c [cafdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
cafenc.c Support more codecs when muxing caf. 2011-08-22 09:35:58 +02:00
cavsvideodec.c
cdg.c
concat.c
crcenc.c
crypto.c
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c [dv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +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
eacdata.c
electronicarts.c
ffm.h Rename ffserver to avserver. 2011-08-09 19:56:25 +02:00
ffmdec.c [ffmdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
ffmenc.c libx264: add 'direct-pred' private option 2011-09-07 07:27:55 +02:00
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
filmstripdec.c [filmstrip] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:51:07 +02:00
filmstripenc.c
flacdec.c
flacenc.c
flacenc.h
flacenc_header.c
flic.c
flv.h flvdec: Started to remove most of the "only 1-audio+1-video" assumptions 2011-09-07 02:36:42 +02:00
flvdec.c Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
flvenc.c flvenc: Correctly encode data stream into in-band metadata frames. 2011-09-07 02:38:15 +02:00
framecrcenc.c
gif.c
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
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 Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
id3v2.h Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +02:00
idcin.c
idroqdec.c
idroqenc.c
iff.c Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +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-09-17 22:36:43 +02:00
internal.h
ipmovie.c
isom.c Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
isom.h Merge remote-tracking branch 'qatar/master' 2011-08-26 01:29:40 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c [jvd] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:39 +02:00
latmenc.c Add loas as an extension for LOAS/LATM. 2011-09-08 08:24:17 +02:00
libavformat.v
libnut.c
librtmp.c
lmlm4.c
loasdec.c Add LOAS demuxer. 2011-08-20 00:27:38 +02:00
lxfdec.c
m4vdec.c
matroska.c
matroska.h
matroskadec.c matroskadec: Fix seeking for matroska files with CUES before first cluster 2011-09-22 21:34:50 +02:00
matroskaenc.c Do not set codec_tag property for matroska muxers. 2011-08-28 23:13:17 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
microdvddec.c
microdvdenc.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov.c Use the parser for AC-3 in mov. 2011-09-21 23:42:03 +02:00
movenc.c Merge remote-tracking branch 'qatar/master' 2011-09-19 22:45:34 +02:00
movenc.h
movenchint.c
mp3dec.c mp3demux: pass on error code on packet read. 2011-09-21 00:51:53 +02:00
mp3enc.c Do not assume timestamps for mp2 format. 2011-08-28 21:43:04 +02:00
mpc.c
mpc8.c [mpc8] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
mpeg.c mpegpsdec: fix reading first mpegps packet 2011-09-18 01:57:56 +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 Merge remote-tracking branch 'qatar/master' 2011-09-21 21:25:43 +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
mtv.c
mvi.c
mxf.c Merge remote-tracking branch 'qatar/master' 2011-09-08 22:37:31 +02:00
mxf.h
mxfdec.c [mxfdec] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
mxfenc.c mxfenc: Add support for MPEG-2 MP@HL-14 in mxf container 2011-09-16 18:16:30 +02:00
mxg.c
ncdec.c
network.h
nsvdec.c [nsv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
nullenc.c
nut.c
nut.h
nutdec.c
nutenc.c Merge remote-tracking branch 'qatar/master' 2011-09-05 03:10:45 +02:00
nuv.c Set AV_PKT_FLAG_KEY based on nupplevideo header 2011-09-18 18:25:44 +02:00
oggdec.c oggdec: fix out of bound write in the ogg demuxer 2011-09-17 09:41:02 -07: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-09-21 21:25:43 +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
pcm.h
pcmdec.c Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
pcmenc.c
pmpdec.c
psxstr.c psxstr: improve probe to not misdetect so much. 2011-09-23 19:10:55 +02:00
pva.c
qcp.c
qtpalette.h
r3d.c [r3d] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
rawdec.c Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
rawdec.h Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
rawenc.c
rawenc.h
rawvideodec.c Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
rdt.c
rdt.h
riff.c Support speex in avi. 2011-08-30 23:45:39 +02:00
riff.h
rl2.c
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2011-09-19 22:45:34 +02:00
rmenc.c
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
rtp.c Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
rtp.h
rtpdec.c
rtpdec.h
rtpdec_amr.c
rtpdec_asf.c Merge remote-tracking branch 'qatar/master' 2011-09-08 22:37:31 +02:00
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
rtpdec_vp8.c
rtpdec_xiph.c
rtpenc.c Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +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
rtsp.c
rtsp.h
rtspcodes.h
rtspdec.c rtspdec: Require TCP-interleaved RTP packets to be at least 11 bytes, instead of 12. 2011-09-20 21:58:15 +02:00
rtspenc.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sdp.c Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
seek-test.c Merge remote-tracking branch 'qatar/master' 2011-08-26 23:18:54 +02:00
seek.c
seek.h
segafilm.c segafilm: Fix potential division by 0 on corrupted segafilm streams in the demuxer. 2011-09-12 21:45:23 +02:00
sierravmd.c
siff.c
smacker.c Fixed off by one packet size allocation in the smacker demuxer. 2011-09-12 23:44:51 +03:00
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
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-09-21 21:25:43 +02:00
swfenc.c
tcp.c
thp.c
tiertexseq.c
timefilter.c
timefilter.h
tmv.c [tmv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
tta.c [tta] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +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
utils.c Merge remote-tracking branch 'qatar/master' 2011-09-24 01:03:07 +02:00
vc1test.c
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +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
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c wav: init st to NULL to avoid a false-positive warning. 2011-09-01 20:23:40 +02:00
wc3movie.c
westwood.c
wtv.c WTV muxer (1_extract_wtv_common_code.patch) 2011-09-08 01:55:07 +02:00
wtv.h WTV muxer (1_extract_wtv_common_code.patch) 2011-09-08 01:55:07 +02:00
wtvdec.c [wtv] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
wtvenc.c wtvenc: add some asserts because iam paranoid 2011-09-14 01:08:01 +02:00
wv.c Merge remote-tracking branch 'qatar/master' 2011-08-21 15:27:02 +02:00
xa.c
xmv.c xmv: eliminate superfluous zeroing of zero data 2011-08-26 16:26:57 +02:00
xwma.c
yop.c [yop] Check return value of avio_seek and avoid modifying state if it fails 2011-09-14 19:53:45 +02:00
yuv4mpeg.c