ffmpeg/libavformat
Michael Niedermayer 9336a980bb Merge remote-tracking branch 'qatar/master'
* qatar/master:
  rtmp: Add support for limelight authentication
  rtmp: Add support for adobe authentication

Conflicts:
	Changelog
	libavformat/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-01-01 14:04:50 +01:00
..
4xm.c check std tag size before reading. 2012-12-01 00:30:11 +01:00
Makefile Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
a64.c
aacdec.c adts_aac_probe: mark buffer pointers as const 2012-12-25 01:41:00 +01:00
ac3dec.c ac3_eac3_probe: mark buffer pointers const 2012-12-25 01:42:23 +01:00
act.c
adtsenc.c
adxdec.c
aea.c
afc.c AFC demuxer 2012-11-27 10:17:28 +00:00
aiff.h aiff: support in24/in32 tags 2012-12-16 10:41:00 +00:00
aiffdec.c
aiffenc.c aiffenc: use ff_raw_write_packet() 2012-12-28 22:06:39 +00:00
allformats.c Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
amr.c
anm.c Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 2012-12-24 15:09:58 +01:00
apc.c
ape.c lavf/apedec: return meaningful error codes 2012-12-06 17:17:49 +00:00
apetag.c
apetag.h
apetagenc.c
aqtitledec.c Add AQTitle subtitles demuxer. 2012-12-30 23:37:14 +01:00
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c asfdec: check extradata size before alloc and read 2012-12-02 20:44:58 +01:00
asfenc.c
assdec.c 10l: export ff_bprint_to_extradata between libs using avpriv_ prefix. 2012-12-30 22:54:56 +01:00
assenc.c
ast.c AST Muxer 2012-12-04 11:25:46 +00:00
ast.h AST Muxer 2012-12-04 11:25:46 +00:00
astdec.c AST Muxer 2012-12-04 11:25:46 +00:00
astenc.c astenc: Remove two AVRationals with denominator 1 2012-12-20 05:05:55 +01:00
au.c auenc: do not write invalid file size 2012-12-28 16:29:22 +00:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
avi.h
avidec.c read_gab2_sub: fix null pointer dereference 2012-12-12 17:46:05 +01:00
avienc.c
avio.c
avio.h
avio_internal.h Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534' 2012-12-19 14:28:58 +01:00
aviobuf.c miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
avisynth.c
avlanguage.c
avlanguage.h
avr.c avr: use ff_pcm_read_packet() 2012-12-05 12:40:57 +00:00
avs.c
bethsoftvid.c Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534' 2012-12-19 14:28:58 +01:00
bfi.c bfi: set duration 2012-12-16 16:53:01 +01:00
bink.c
bintext.c
bit.c
bluray.c
bmv.c
brstm.c brstm: ask for samples for version != 1.0 2012-12-16 15:05:31 +01:00
c93.c
cache.c
caf.c
caf.h
cafdec.c cafdec: Check duration before use. 2012-12-12 01:22:09 +01:00
cafenc.c cafenc: do not include riff.h 2012-12-05 20:44:28 +00:00
cavsvideodec.c
cdg.c
cdxl.c
concat.c
concatdec.c concatdec: change data type to suppress warning about limited range of data type on some platforms. 2012-12-17 17:31:34 +01:00
crcenc.c
crypto.c
cutils.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dtshddec.c
dv.c
dv.h
dvenc.c Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
dxa.c lavf/dxa: return meaningful error codes 2012-12-05 20:18:04 +00:00
eacdata.c
electronicarts.c
epafdec.c Ensoniq Paris Audio File demuxer 2012-12-05 13:01:22 +00:00
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c file: fix 10l error in access() check 2012-11-27 13:24:00 +01:00
filmstripdec.c Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 2012-12-24 15:09:58 +01:00
filmstripenc.c
flacdec.c flac_probe: make buffer pointers const 2012-12-25 01:43:14 +01:00
flacenc.c
flacenc.h
flacenc_header.c
flic.c
flv.h
flvdec.c
flvenc.c Merge commit 'a925f723a915bc0255e2673f8817af5212131763' 2012-12-21 14:06:42 +01:00
framecrcenc.c
framehash.c
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c gifdec: do not handle timestamps 2012-12-04 15:21:24 +00:00
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
h261dec.c
h263dec.c
h264dec.c
hls.c miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
hlsenc.c Merge commit '30a76487304e7250294c9c0e9fa179bf07fd822a' 2012-12-30 14:21:55 +01:00
hlsproto.c miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
http.c http: dont null check p, its unneeded 2012-12-11 00:03:23 +01:00
http.h miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
httpauth.c
httpauth.h
icodec.c
icoenc.c add forgotten AV_ prefix to some CODEC_IDs 2012-12-09 01:47:58 +00:00
id3v1.c
id3v1.h
id3v2.c id3v2: check index against buffer size. Fix out of array access 2012-11-29 23:12:42 +01:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c iff demuxer: support RGB8 and RGBN 2012-12-11 20:17:30 +11:00
ilbc.c
img2.c Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320' 2012-11-30 14:49:13 +01:00
img2dec.c Add exception for "gif" in image2 probe() method. 2012-11-30 14:35:11 +00:00
img2enc.c img2enc: fix typo 2012-12-21 22:56:13 +01:00
ingenientdec.c
internal.h doxy: Clarify what avpriv_set_pts_info does 2012-12-17 11:20:00 -05:00
ipmovie.c ipmovie_probe: make buffer pointers const 2012-12-25 01:44:59 +01:00
ircam.c add forgotten AV_ prefix to some CODEC_IDs 2012-12-09 01:47:58 +00:00
ircam.h IRCAM demuxer & muxer 2012-12-05 13:01:22 +00:00
ircamdec.c IRCAM demuxer & muxer 2012-12-05 13:01:22 +00:00
ircamenc.c ircamenc: 10l do not use avio_skip() 2012-12-05 13:46:35 +00:00
isom.c Merge commit 'c661cb6672af5ebcb900ec8766b24761bd2ab011' 2012-12-20 12:06:15 +01:00
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c 10l: export ff_bprint_to_extradata between libs using avpriv_ prefix. 2012-12-30 22:54:56 +01:00
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libmodplug.c
libnut.c
librtmp.c
lmlm4.c lmlm4_probe: make buffer pointers const 2012-12-25 01:45:43 +01:00
loasdec.c loas_probe: make buffer pointers const 2012-12-25 01:45:56 +01:00
log2_tab.c
lvfdec.c
lxfdec.c Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
m4vdec.c
matroska.c
matroska.h
matroskadec.c matroskadec: reset size when freeing data. 2012-12-04 03:50:09 +01:00
matroskaenc.c lavf/matroskaenc: check for overflow in display width. 2012-12-13 12:45:07 +01:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c microdvd: sanitize AVPackets. 2012-12-31 00:41:35 +01:00
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c mmfenc: use ff_raw_write_packet() 2012-12-28 22:21:56 +00:00
mms.c
mms.h
mmsh.c
mmst.c
mov.c mov: fix handling of odd sized yv12 2013-01-01 00:44:44 +01:00
mov_chan.c
mov_chan.h
movenc.c
movenc.h
movenchint.c
mp3dec.c mp3_read_probe: make buffer related pointers const 2012-12-25 01:51:32 +01:00
mp3enc.c
mpc.c
mpc8.c mpc8_probe: make buffer related pointers and function arguments const 2012-12-25 01:51:59 +01:00
mpeg.c mpegps_probe: make buffer related pointers const 2012-12-25 01:50:14 +01:00
mpeg.h
mpegenc.c
mpegts.c mpegts: update AVProgram after pmt change 2012-12-25 20:30:36 +01:00
mpegts.h
mpegtsenc.c
mpegvideodec.c
mpjpeg.c
mpl2dec.c Add MPL2 subtitles demuxer and decoder. 2012-12-30 22:37:25 +01:00
mpsubdec.c Add MPlayer subtitles demuxer. 2012-12-30 23:09:49 +01:00
msnwc_tcp.c
mtv.c Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 2012-12-24 15:09:58 +01:00
mux.c lavf: split packets before muxing. 2012-12-20 16:13:52 +01:00
mvdec.c mcdec: suppress "warning: a/vst may be used uninitialized in this function" 2012-12-24 18:31:37 +01:00
mvi.c mvi: check av_mallocz() result 2012-12-01 09:06:24 +00:00
mxf.c
mxf.h
mxfdec.c mxfdec: Rescale audio stream duration from EditRate to SampleRate 2012-12-25 17:45:34 +01:00
mxfenc.c
mxg.c
ncdec.c
network.c Fix OS/2 threading 2012-12-29 18:56:33 +01:00
network.h
nistspheredec.c NIST SPHERE demuxer 2012-12-23 21:22:43 +00:00
nsvdec.c Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534' 2012-12-19 14:28:58 +01:00
nullenc.c
nut.c Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
nut.h Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
nutdec.c nutdec: sanity check r_frame_rate 2012-12-18 14:03:04 +01:00
nutenc.c Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
nuv.c Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd' 2012-11-29 14:16:46 +01:00
oggdec.c oggdec: fix warning: assignment discards qualifiers from pointer target type 2012-12-24 22:37:24 +01:00
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c oggspeexparse: fix array overread 2012-12-12 11:21:23 +01:00
oggparsetheora.c
oggparsevorbis.c oggparsevorbis: check channels 2012-12-17 20:51:50 +01:00
oma.c
oma.h
omadec.c Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
omaenc.c
options.c
options_table.h Merge commit 'c35f0e8495e34c2082dcde805e9323c9f6a4cb0a' 2012-12-18 14:27:59 +01:00
os_support.c
os_support.h
paf.c
pcm.c lavf/pcm: check size, do not produce invalid packets 2012-12-07 13:05:43 +00:00
pcm.h pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers 2012-12-05 12:40:57 +00:00
pcmdec.c pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers 2012-12-05 12:40:57 +00:00
pcmenc.c
pjsdec.c Add PJS subtitles demuxer and decoder. 2012-12-30 23:55:28 +01:00
pmpdec.c
psxstr.c str_probe: make buffer related pointers const 2012-12-25 01:55:22 +01:00
pva.c pva_probe: make buffer related pointers and function arguments const 2012-12-25 01:54:41 +01:00
pvfdec.c pvfdec: drop pointless casting of buffer in ff_get_line() 2012-12-19 15:55:39 +00:00
qcp.c
qtpalette.h
r3d.c
rawdec.c raw demuxer: initialize end of partial packets 2012-12-05 00:02:43 +01:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c rawvideodec: set bit rate 2012-12-04 15:52:58 +00:00
rdt.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rdt.h
realtextdec.c lavf: use ff_subtitles_queue_seek() for text subtitles demuxers. 2012-12-02 00:06:03 +01:00
riff.c add forgotten AV_ prefix to some CODEC_IDs 2012-12-09 01:47:58 +00:00
riff.h Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
rl2.c rl2: return EOF on EOF 2012-12-24 02:51:51 +01:00
rm.c
rm.h
rmdec.c rmdec: fix compiler warning for uninitialized variables 2012-12-25 23:54:34 +01:00
rmenc.c rmenc: write correct bytes per minute 2012-12-23 16:08:10 +01:00
rmsipr.c
rmsipr.h
rpl.c
rso.c
rso.h
rsodec.c Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 2012-12-24 15:09:58 +01:00
rsoenc.c
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a' 2013-01-01 13:54:22 +01:00
rtmppkt.h Merge commit '33f28a3be3092f642778253d9529dd66fe2a014a' 2013-01-01 13:54:22 +01:00
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2013-01-01 14:04:50 +01:00
rtp.c Merge commit 'a925f723a915bc0255e2673f8817af5212131763' 2012-12-21 14:06:42 +01:00
rtp.h
rtpdec.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec.h Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_amr.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_asf.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_formats.h Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_g726.c
rtpdec_h263.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_h263_rfc2190.c rtpdec: Pass the sequence number to depacketizers 2012-12-21 14:14:40 +02:00
rtpdec_h264.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_ilbc.c
rtpdec_jpeg.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_latm.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_mpeg4.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_qcelp.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_qdm2.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_qt.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_svq3.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpdec_vp8.c Merge commit 'c7d4de3d730473167e31cf765e0333c965f934d3' 2012-12-21 17:51:31 +01:00
rtpdec_xiph.c Merge commit '90c784cc13f6bf21a8eb69f3b88b50c7a70f6c59' 2012-12-21 17:46:43 +01:00
rtpenc.c Merge commit 'f322b2073581119de5da74f92a03309a36891cfa' 2012-12-17 14:06:11 +01:00
rtpenc.h Merge commit 'f322b2073581119de5da74f92a03309a36891cfa' 2012-12-17 14:06:11 +01:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd' 2012-11-29 14:16:46 +01:00
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h263_rfc2190.c
rtpenc_h264.c
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c Merge commit '65e053271a98f7acf3ef6b412998cfcb44a8eef8' 2012-12-17 13:46:54 +01:00
rtpenc_xiph.c
rtpproto.c Merge remote-tracking branch 'qatar/master' 2012-12-13 12:23:48 +01:00
rtsp.c
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c 10l: export ff_bprint_to_extradata between libs using avpriv_ prefix. 2012-12-30 22:54:56 +01:00
sapdec.c
sapenc.c Merge commit 'a925f723a915bc0255e2673f8817af5212131763' 2012-12-21 14:06:42 +01:00
sauce.c sauce: test filetype correctly for datatype 5 (binary text) 2012-12-14 16:46:29 +11:00
sauce.h
sbgdec.c
sctp.c sctp: dont abort on invalid input 2012-12-17 01:53:35 +01:00
sdp.c
seek-test.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
seek.c
seek.h
segafilm.c
segment.c lavf/segment: add segment_frames option 2012-12-28 11:17:22 +01:00
sierravmd.c
siff.c siff: set duration 2012-12-17 13:34:30 +01:00
smacker.c smacker: use meaningful error codes 2012-12-06 18:06:52 +00:00
smjpeg.c
smjpeg.h
smjpegdec.c Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 2012-12-24 15:09:58 +01:00
smjpegenc.c Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
smoothstreamingenc.c Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3' 2012-12-21 17:32:52 +01:00
smush.c
sol.c
sox.h
soxdec.c soxdec: use meaningful error codes 2012-12-28 21:50:42 +00:00
soxenc.c soxenc: use ff_raw_write_packet() 2012-12-28 21:58:03 +00:00
spdif.c
spdif.h
spdifdec.c
spdifenc.c Merge commit 'f3298f12997eb4b7ad203766f768f92e3dd72a2a' 2012-12-24 15:09:58 +01:00
srtdec.c lavf: move srtdec:read_chunk() to subtitles utils. 2012-12-30 22:58:58 +01:00
srtenc.c lavf/srtenc: honor subtitle position side data. 2012-12-20 16:13:52 +01:00
subtitles.c lavf: move srtdec:read_chunk() to subtitles utils. 2012-12-30 22:58:58 +01:00
subtitles.h lavf/subtitles: fix CLRF/CRLF typo. 2012-12-30 23:14:34 +01:00
subviewer1dec.c Add SubViewer v1 subtitles demuxer and decoder. 2012-12-31 00:01:58 +01:00
subviewerdec.c 10l: export ff_bprint_to_extradata between libs using avpriv_ prefix. 2012-12-30 22:54:56 +01:00
swf.c
swf.h Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
swfdec.c Merge commit 'd04c17c91363a6b15d1ac2d79c817f3d5e2998b3' 2012-12-12 10:16:23 +01:00
swfenc.c
takdec.c tak: reduce difference with qatar 2012-12-09 22:01:00 +00:00
tcp.c
tedcaptionsdec.c lavf: TED Talks JSON captions demuxer. 2012-12-09 18:50:38 +01:00
thp.c thp: set duration 2012-12-16 10:27:54 +00:00
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c
udp.c
url-test.c Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967' 2012-12-05 13:34:45 +01:00
url.h
urldecode.c
urldecode.h
utils.c lavf: Remove "Adjusting PTS forward" code 2012-12-21 05:12:05 +01:00
vc1test.c
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2013-01-01 14:04:50 +01:00
vivo.c add forgotten AV_ prefix to some CODEC_IDs 2012-12-09 01:47:58 +00:00
voc.c
voc.h Merge commit 'bfe5454cd238b16e7977085f880205229103eccb' 2012-11-29 13:45:57 +01:00
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vplayerdec.c Add VPlayer subtitles demuxer and decoder. 2012-12-30 22:46:42 +01:00
vqf.c
w64.c Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
w64.h Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
wavdec.c Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
wavenc.c Sony Wave64 muxer 2012-12-31 07:10:57 +00:00
wc3movie.c
webvttdec.c lavf: use ff_subtitles_queue_seek() for text subtitles demuxers. 2012-12-02 00:06:03 +01:00
westwood_aud.c
westwood_vqa.c westwood_vqa: fix null pointer dereference 2012-12-14 17:55:57 +01:00
wtv.c miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
wtv.h
wtvdec.c wtv: permit root table and first sectors to be located beyond 2GB boundary 2012-12-19 00:18:17 +11:00
wtvenc.c wtv: permit root table and first sectors to be located beyond 2GB boundary 2012-12-19 00:18:17 +11:00
wv.c
wvenc.c
xa.c
xmv.c miscellaneous typo fixes 2012-12-21 00:18:34 +01:00
xwma.c
yop.c yop: set video bit rate 2012-12-21 21:18:12 +01:00
yuv4mpeg.c lavf/y4m: spellcheck 2012-12-23 01:01:17 +01:00