Michael Niedermayer 1232723741 Merge remote-tracking branch 'qatar/master' ... * qatar/master: aacenc: Fix issues with huge values of bit_rate. dv_tablegen: Drop unnecessary av_unused attribute from dv_vlc_map_tableinit(). proresenc: multithreaded quantiser search riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header avconv: only set the "channels" option when it exists for the specified input format avplay: update get_buffer to be inline with avconv aacdec: More robust output configuration. faac: Fix multi-channel ordering faac: Add .channel_layouts rtmp: Support 'rtmp_playpath', an option which overrides the stream identifier rtmp: Support 'rtmp_app', an option which overrides the name of application avutil: add better documentation for AVSampleFormat Conflicts: libavcodec/aac.h libavcodec/aacdec.c libavcodec/aacenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-04-18 00:28:06 +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	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
aiffenc.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
allformats.c	"Metal Gear Solid: The Twin Snakes" demuxer	2012-03-25 12:22:06 +02:00
amr.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
anm.c
apc.c
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	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +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	Add skip_to_keyframe stream variable.	2012-04-16 22:13:11 +02:00
avi.h
avidec.c	avidec: Dont crash on avi packets that belong to dv streams in dv in avi	2012-04-17 17:58:19 +02:00
avienc.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
avio_internal.h
avio.c
avio.h	Add AVIO_FLAG_DIRECT.	2012-04-04 20:39:33 +02:00
aviobuf.c	Add AVIO_FLAG_DIRECT.	2012-04-04 20:39:33 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c	Merge remote-tracking branch 'qatar/master'	2012-03-03 00:23:10 +01:00
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bluray.c	bluray protocol	2012-03-03 04:30:49 +01:00
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	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
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
daud.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +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-04-06 22:52:01 +02:00
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c	electronicarts vp6: set duration of video stream	2012-03-22 13:15:17 +01:00
ffm.h
ffmdec.c
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	flv: clarify use of video info/cmd frame.	2012-03-20 07:53:40 +01:00
flvdec.c	flvdec: allocate large enough buffer so get_bits() doesnt overread	2012-04-16 12:01:55 +02:00
flvenc.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
framecrcenc.c
framehash.c
g723_1.c
g729dec.c
gif.c
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
hlsproto.c
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-04-02 00:17:02 +02:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c	Merge remote-tracking branch 'qatar/master'	2012-03-13 01:56:33 +01: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	Merge remote-tracking branch 'qatar/master'	2012-03-18 23:39:42 +01:00
ingenientdec.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
internal.h	Merge remote-tracking branch 'qatar/master'	2012-03-21 01:33:53 +01:00
ipmovie.c
isom.c	Support detecting and demuxing EIA-608 subtitles in mov.	2012-04-07 22:11:21 +02:00
isom.h	Merge remote-tracking branch 'qatar/master'	2012-04-14 22:37:43 +02:00
iss.c
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
jvdec.c	Merge remote-tracking branch 'qatar/master'	2012-03-15 01:27:10 +01:00
latmenc.c	latmenc: replace per-frame malloc/free by constant size buffer.	2012-04-14 18:21:19 +02:00
libavformat.v	libavformat.v: add ffio_set_buf_size() for ffserver.	2012-03-12 06:04:37 +01:00
libmodplug.c
libnut.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +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	Merge remote-tracking branch 'qatar/master'	2012-03-26 20:52:52 +02:00
matroska.c
matroska.h
matroskadec.c	matroskadec: check headerstrip data availability.	2012-04-17 17:58:19 +02:00
matroskaenc.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
md5enc.c
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
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	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_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	mov: reset dref_count on realloc to keep values consistent.	2012-04-15 23:37:09 +02:00
movenc.c	Merge remote-tracking branch 'qatar/master'	2012-04-13 21:50:37 +02:00
movenc.h	Merge remote-tracking branch 'qatar/master'	2012-03-21 01:33:53 +01:00
movenchint.c
mp3dec.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
mp3enc.c	mp3enc: clarify meaning of "Unsupported" messages.	2012-04-14 18:21:19 +02:00
mpc8.c
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	mpegpsenc: fix user specified mux rate	2012-04-07 07:56:55 +02:00
mpegts.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
mpegts.h
mpegtsenc.c	mpegtsenc: Add support to mux s302 stream	2012-04-08 09:44:14 +02: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	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
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: Fix regression on files from Pinnacle Thunder	2012-04-04 17:43:17 +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
nullenc.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
nut.c	Support yuva444p rawvideo in nut.	2012-04-06 00:53:09 +02:00
nut.h
nutdec.c	Merge remote-tracking branch 'qatar/master'	2012-04-11 22:50:22 +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	oggdec: Safety check against stream counts being inconsistent in seek()	2012-04-17 14:44:06 +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	oggparseogm: fix order of arguments of avpriv_set_pts_info().	2012-03-22 19:51:43 +01:00
oggparseskeleton.c	vorbisdemux: Check private context in theoras gtopts.	2012-03-23 04:29:33 +01:00
oggparsespeex.c
oggparsetheora.c	vorbisdemux: Check private context in theoras gtopts.	2012-03-23 04:29:33 +01:00
oggparsevorbis.c	oggparsevorbis: Remove code messing with cur_dts.	2012-04-11 14:56:02 +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 sizes against buffer size	2012-04-16 13:51:40 +02:00
omaenc.c
options_table.h	Add AVIO_FLAG_DIRECT.	2012-04-04 20:39:33 +02:00
options.c	Merge remote-tracking branch 'qatar/master'	2012-03-21 01:33:53 +01:00
os_support.c
os_support.h
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pmpdec.c
psxstr.c	Merge remote-tracking branch 'qatar/master'	2012-03-04 04:26:04 +01:00
pva.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
qcp.c
qtpalette.h
r3d.c	Merge remote-tracking branch 'qatar/master'	2012-03-10 01:12:08 +01:00
rawdec.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +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	Merge remote-tracking branch 'qatar/master'	2012-03-06 06:03:32 +01:00
rdt.h
riff.c	riff: use bps instead of bits_per_coded_sample in the WAVEFORMATEXTENSIBLE header	2012-04-17 00:09:19 -04:00
riff.h
rl2.c
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	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
rtmpproto.c	Merge remote-tracking branch 'qatar/master'	2012-04-18 00:28:06 +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-04-08 20:55:11 +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: Use MB info side data for splitting H263 packets for RFC 2190	2012-03-01 16:08:32 +02:00
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	Merge remote-tracking branch 'qatar/master'	2012-03-20 00:03:19 +01:00
rtpproto.c
rtsp.c	Merge remote-tracking branch 'qatar/master'	2012-04-08 20:55:11 +02:00
rtsp.h
rtspcodes.h
rtspdec.c	Merge remote-tracking branch 'qatar/master'	2012-04-08 20:55:11 +02:00
rtspenc.c	Merge remote-tracking branch 'qatar/master'	2012-03-20 00:03:19 +01:00
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
sdp.c	Merge remote-tracking branch 'qatar/master'	2012-03-29 04:11:10 +02:00
seek-test.c	Merge remote-tracking branch 'qatar/master'	2012-03-29 04:11:10 +02:00
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	segafilm: make the loop condition in film_read_packet() match the contents.	2012-04-16 02:18:09 +02: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-04-06 22:52:01 +02: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
sox.h
soxdec.c
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	swfdec: support compressed swf.	2012-04-03 19:12:52 +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-03-06 06:03:32 +01:00
tcp.c	Merge remote-tracking branch 'qatar/master'	2012-03-29 04:11:10 +02:00
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	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	Merge remote-tracking branch 'qatar/master'	2012-03-29 04:11:10 +02:00
url.h	Merge remote-tracking branch 'qatar/master'	2012-03-20 00:03:19 +01:00
utils.c	Add skip_to_keyframe stream variable.	2012-04-16 22:13:11 +02:00
vc1test.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00
vc1testenc.c
version.h	"Metal Gear Solid: The Twin Snakes" demuxer	2012-03-25 12:22:06 +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	Merge remote-tracking branch 'qatar/master'	2012-03-04 04:26:04 +01:00
wav.c	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +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: fix name_size check to consider integer overflows.	2012-04-14 18:54:10 +02:00
wtvenc.c
wv.c
xa.c	Merge remote-tracking branch 'qatar/master'	2012-03-21 01:33:53 +01:00
xmv.c	xmv: check channel number	2012-03-23 10:31:45 +01: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	Merge remote-tracking branch 'qatar/master'	2012-04-06 22:52:01 +02:00