Michael Niedermayer 849a8c4cdb Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4' ... * commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4': oggparsevorbis: export replaygain tags from Vorbis comments Conflicts: libavformat/Makefile libavformat/oggparsevorbis.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-04-04 23:17:33 +02:00
..
4xm.c	…
Makefile	Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'	2014-04-04 23:17:33 +02:00
a64.c	…
aacdec.c	Merge remote-tracking branch 'qatar/master'	2014-03-16 22:38:05 +01:00
ac3dec.c	avformat/ac3dec: Use avpriv_ac3_parse_header2()	2014-03-01 01:56:25 +01:00
act.c	…
adp.c	…
adtsenc.c	…
adxdec.c	…
aea.c	…
afc.c	…
aiff.h	…
aiffdec.c	…
aiffenc.c	…
allformats.c	avformat: add image2 brender pix demuxer	2014-03-28 23:54:51 +01:00
amr.c	…
anm.c	…
apc.c	…
ape.c	…
apetag.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
apetag.h	…
aqtitledec.c	…
asf.c	…
asf.h	…
asfcrypt.c	…
asfcrypt.h	…
asfdec.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
asfenc.c	…
assdec.c	Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'	2014-03-02 21:44:44 +01:00
assenc.c	…
ast.c	…
ast.h	…
astdec.c	…
astenc.c	…
au.c	…
audiointerleave.c	…
audiointerleave.h	…
avc.c	…
avc.h	…
avformat.h	libavformat/utils.c: av_pkt_dump_log2: use const pointers	2014-04-03 13:31:13 +02:00
avformatres.rc	…
avi.h	…
avidec.c	avformat/avidec: remove unused variables	2014-04-02 19:04:58 +02:00
avienc.c	Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'	2014-03-04 22:21:58 +01:00
avio.c	avformat/avio: also set generic URL context options	2014-03-30 15:00:03 +02:00
avio.h	libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback	2014-03-26 23:58:48 +01:00
avio_internal.h	…
aviobuf.c	libavformat/aviobuf: keep track of the original buffer-size and restore it after probe/ensure-seekback	2014-03-26 23:58:48 +01:00
avisynth.c	…
avlanguage.c	…
avlanguage.h	…
avr.c	…
avs.c	…
bethsoftvid.c	…
bfi.c	…
bink.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
bintext.c	…
bit.c	…
bluray.c	…
bmv.c	…
boadec.c	…
brstm.c	…
c93.c	…
cache.c	…
caf.c	…
caf.h	…
cafdec.c	avformat: revert %c changes from d92024f18f	2014-03-12 05:09:28 +01:00
cafenc.c	…
cavsvideodec.c	…
cdg.c	…
cdxl.c	…
cinedec.c	Phantom Cine demuxer (iteration 2014.3)	2014-03-16 18:24:30 +01:00
concat.c	…
concatdec.c	lavf/concatdec: allow to match streams by id.	2014-03-23 19:15:07 +01:00
crcenc.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
crypto.c	…
cutils.c	…
data_uri.c	…
daud.c	…
dfa.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
diracdec.c	…
dnxhddec.c	…
dsicin.c	…
dtsdec.c	…
dtshddec.c	…
dv.c	…
dv.h	…
dvenc.c	…
dxa.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
eacdata.c	…
electronicarts.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
epafdec.c	…
ffm.h	…
ffmdec.c	…
ffmenc.c	…
ffmeta.h	…
ffmetadec.c	…
ffmetaenc.c	…
file.c	…
file_open.c	…
filmstripdec.c	…
filmstripenc.c	…
flac_picture.c	…
flac_picture.h	…
flacdec.c	Merge commit '1d55f8d5f6f2cd74fa27170e2be37a72441d9202'	2014-04-04 22:59:28 +02:00
flacenc.c	…
flacenc.h	…
flacenc_header.c	…
flic.c	…
flv.h	…
flvdec.c	avformat/flvdec: discard inconsistent timestamps	2014-03-12 01:50:41 +01:00
flvenc.c	…
format.c	…
framecrcenc.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
framehash.c	…
frmdec.c	…
ftp.c	lavf/ftp: fix seek to nagative position	2014-02-28 00:07:31 +01:00
g722.c	…
g723_1.c	…
g729dec.c	…
gif.c	Write aspect ratio when muxing gif.	2014-04-02 09:49:30 +02:00
gifdec.c	…
golomb_tab.c	avformat: fix hevcs use of golomb from avformat	2014-03-09 22:59:46 +01:00
gopher.c	…
gsmdec.c	…
gxf.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
gxf.h	…
gxfenc.c	…
h261dec.c	…
h263dec.c	…
h264dec.c	…
hdsenc.c	…
hevc.c	Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'	2014-03-10 23:38:01 +01:00
hevc.h	Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'	2014-03-10 23:38:01 +01:00
hevcdec.c	…
hls.c	…
hlsenc.c	avformat/hlsenc: remove unneeded l prefix from %lf	2014-04-03 00:27:53 +02:00
hlsproto.c	…
hnm.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
http.c	http: restructure http_connect error handling path	2014-03-23 05:56:35 +01:00
http.h	…
httpauth.c	avformat/httpauth: add comment about "" and algorithm	2014-03-03 17:04:57 +01:00
httpauth.h	…
icodec.c	…
icoenc.c	…
id3v1.c	…
id3v1.h	…
id3v2.c	avformat/id3v2: decode compilation metadata	2014-03-15 04:29:19 +01:00
id3v2.h	…
id3v2enc.c	…
idcin.c	…
idroqdec.c	…
idroqenc.c	RoQ encoder: support different integer framerates	2014-02-03 02:04:38 +01:00
iff.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
ilbc.c	…
img2.c	OpenEXR decoder	2014-04-01 01:13:09 +02:00
img2.h	avformat/img2dec: make image2dec capable to be used from seperate demuxers	2014-03-28 23:54:51 +01:00
img2_alias_pix.c	avformat/img2_alias_pix: rewrite probe function	2014-03-29 00:38:51 +01:00
img2_brender_pix.c	avformat: add image2 brender pix demuxer	2014-03-28 23:54:51 +01:00
img2dec.c	avformat/img2dec: zero probe buffer	2014-03-31 23:47:29 +02:00
img2enc.c	Merge commit 'e50f5d3cf9ef9a16982a5cb4d8b1916cd963aa5b'	2014-03-27 01:10:28 +01:00
ingenientdec.c	…
internal.h	lavf: add write_uncoded_frame() API.	2014-02-11 10:29:02 +01:00
ipmovie.c	…
ircam.c	…
ircam.h	…
ircamdec.c	…
ircamenc.c	…
isom.c	Merge commit '121b5b7e0476d22408d748b914799b7c00acc3a4'	2014-04-04 02:44:56 +02:00
isom.h	…
iss.c	…
iv8.c	…
ivfdec.c	…
ivfenc.c	…
jacosubdec.c	…
jacosubenc.c	…
jvdec.c	Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'	2014-02-14 01:51:17 +01:00
latmenc.c	…
libavformat.v	…
libgme.c	…
libmodplug.c	Fix modplug linkage on Windows.	2014-03-11 13:22:49 +01:00
libnut.c	…
libquvi.c	…
librtmp.c	…
libssh.c	lavf/libssh: fix seek to nagative position	2014-02-28 00:04:29 +01:00
lmlm4.c	…
loasdec.c	…
log2_tab.c	…
lvfdec.c	…
lxfdec.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
m4vdec.c	…
matroska.c	…
matroska.h	…
matroskadec.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
matroskaenc.c	Merge remote-tracking branch 'qatar/master'	2014-03-09 23:41:02 +01:00
md5enc.c	…
md5proto.c	…
metadata.c	…
metadata.h	…
mgsts.c	…
microdvddec.c	avformat/microdvd: export the declared frame rate	2014-03-03 23:33:47 +01:00
microdvdenc.c	…
mkvtimestamp_v2.c	…
mm.c	…
mmf.c	…
mms.c	…
mms.h	…
mmsh.c	…
mmst.c	…
mov.c	Merge commit 'f1c4a54f6ecbf77a29aaaee09ca70c5468d0c509'	2014-04-02 03:15:19 +02:00
mov_chan.c	…
mov_chan.h	…
movenc.c	Merge commit 'cba4e6062a02d5bf684e13a770be88aa1fec717e'	2014-04-02 02:54:09 +02:00
movenc.h	Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f'	2014-03-23 03:22:20 +01:00
movenchint.c	…
mp3dec.c	Merge commit '15c5a8d22d12d29a364ca2ab6438f1dee2fa08c7'	2014-03-24 15:11:08 +01:00
mp3enc.c	avformat/mp3enc: use av_copy_packet()	2014-03-22 01:26:48 +01:00
mpc.c	…
mpc8.c	…
mpeg.c	Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'	2014-03-24 05:28:07 +01:00
mpeg.h	…
mpegenc.c	…
mpegts.c	mpegts: fix teletext pts of streams with standalone pcr pid	2014-03-22 13:55:01 +01:00
mpegts.h	avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode	2014-03-30 16:36:22 +02:00
mpegtsenc.c	avformat/mpegtsenc: move startcode validity check to ff_check_h264_startcode	2014-03-30 16:36:22 +02:00
mpegvideodec.c	…
mpjpeg.c	…
mpl2dec.c	…
mpsubdec.c	…
msnwc_tcp.c	…
mtv.c	libavformat/mtv: add test for audio magic	2014-02-01 21:09:14 -08:00
mux.c	avformat/mux: support shifting timestamps so they start at 0	2014-02-22 22:39:49 +01:00
mvdec.c	…
mvi.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
mxf.c	Merge commit '92ebb332157195b7c1212e734c5668afbf19cf2b'	2014-03-19 20:39:05 +01:00
mxf.h	Merge commit '6920fb2b33f84b114ea4561ae1c623f4a26562e5'	2014-03-19 20:54:35 +01:00
mxfdec.c	Merge commit 'ad8f736b7404503d8f5164f4879175a2258dd64b'	2014-04-04 02:18:32 +02:00
mxfenc.c	…
mxg.c	…
ncdec.c	…
network.c	…
network.h	…
nistspheredec.c	…
noproxy-test.c	…
nsvdec.c	…
nullenc.c	…
nut.c	Merge commit '58c215961a9067bb670387bbd72286c30de04b93'	2014-03-17 15:43:55 +01:00
nut.h	…
nutdec.c	…
nutenc.c	…
nuv.c	…
oggdec.c	oggdec: validate VP8 keyframes	2014-02-24 02:24:21 +01:00
oggdec.h	ogg: allow streams to update metadata	2014-02-05 22:36:42 +01:00
oggenc.c	oggenc: check return value of av_mallocz()	2014-04-04 15:56:52 +02:00
oggparsecelt.c	…
oggparsedirac.c	…
oggparseflac.c	…
oggparseogm.c	…
oggparseopus.c	lavf/oggparseopus: Setting seek_preroll in AVCodecContext	2014-02-05 21:16:36 +01:00
oggparseskeleton.c	…
oggparsespeex.c	…
oggparsetheora.c	…
oggparsevorbis.c	Merge commit '0048deb84cb6d22ba7f4fd7c8b4ecc054fcc22d4'	2014-04-04 23:17:33 +02:00
oggparsevp8.c	…
oma.c	…
oma.h	…
omadec.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
omaenc.c	…
options.c	Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'	2014-02-04 15:37:05 +01:00
options_table.h	avformat: extracting NTP timestamp from RTCP	2014-03-12 13:33:14 +01:00
os_support.c	…
os_support.h	…
paf.c	Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033'	2014-03-28 04:32:05 +01:00
pcm.c	…
pcm.h	…
pcmdec.c	pcmdec: replace a reachable assert with an error check	2014-02-10 07:41:21 +01:00
pcmenc.c	…
pjsdec.c	…
pmpdec.c	…
psxstr.c	…
pva.c	…
pvfdec.c	…
qcp.c	…
qtpalette.h	…
r3d.c	…
rawdec.c	…
rawdec.h	…
rawenc.c	Add raw HEVC muxer	2014-02-09 14:29:07 +00:00
rawenc.h	…
rawvideodec.c	…
rdt.c	…
rdt.h	…
realtextdec.c	…
redspark.c	…
replaygain.c	Merge commit '8542f9c4f17125d483c40c0c5723842f1c982f81'	2014-04-04 22:52:12 +02:00
replaygain.h	Merge commit '5a7e35dd2351c30bab45177b9482cb8833a0ca78'	2014-03-24 14:03:55 +01:00
riff.c	On2 VP7 decoder	2014-04-04 04:00:11 +02:00
riff.h	avformat/riff: return error code from ff_get_guid()	2014-02-12 15:59:15 +01:00
riffdec.c	avformat/riff: return error code from ff_get_guid()	2014-02-12 15:59:15 +01:00
riffenc.c	riff: add ISMP/timecode tag	2014-04-04 00:28:28 +02:00
rl2.c	…
rm.c	…
rm.h	…
rmdec.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
rmenc.c	…
rmsipr.c	…
rmsipr.h	…
rpl.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
rsd.c	…
rso.c	…
rso.h	…
rsodec.c	…
rsoenc.c	…
rtmp.h	…
rtmpcrypt.c	…
rtmpcrypt.h	…
rtmpdh.c	…
rtmpdh.h	…
rtmphttp.c	…
rtmppkt.c	Merge remote-tracking branch 'qatar/master'	2014-03-07 14:09:35 +01:00
rtmppkt.h	Merge remote-tracking branch 'qatar/master'	2014-03-07 14:09:35 +01:00
rtmpproto.c	…
rtp.c	…
rtp.h	…
rtpdec.c	…
rtpdec.h	…
rtpdec_amr.c	…
rtpdec_asf.c	…
rtpdec_formats.h	…
rtpdec_g726.c	…
rtpdec_h263.c	…
rtpdec_h263_rfc2190.c	…
rtpdec_h264.c	…
rtpdec_ilbc.c	…
rtpdec_jpeg.c	…
rtpdec_latm.c	…
rtpdec_mpeg4.c	…
rtpdec_mpeg12.c	…
rtpdec_mpegts.c	…
rtpdec_qcelp.c	…
rtpdec_qdm2.c	…
rtpdec_qt.c	…
rtpdec_svq3.c	…
rtpdec_vp8.c	…
rtpdec_xiph.c	…
rtpenc.c	avformat: extracting NTP timestamp from RTCP	2014-03-12 13:33:14 +01:00
rtpenc.h	…
rtpenc_aac.c	…
rtpenc_amr.c	…
rtpenc_chain.c	…
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	…
rtpenc_xiph.c	…
rtpproto.c	…
rtpproto.h	…
rtsp.c	avformat: extracting NTP timestamp from RTCP	2014-03-12 13:33:14 +01:00
rtsp.h	Add "prefer_tcp" flag to "rtsp_flags"	2014-03-04 22:54:13 +01:00
rtspcodes.h	…
rtspdec.c	…
rtspenc.c	avformat: extracting NTP timestamp from RTCP	2014-03-12 13:33:14 +01:00
samidec.c	…
sapdec.c	…
sapenc.c	avformat: extracting NTP timestamp from RTCP	2014-03-12 13:33:14 +01:00
sauce.c	…
sauce.h	…
sbgdec.c	…
sctp.c	…
sdp.c	…
sdr2.c	avformat/sdr2: h264 stream needs parsing	2014-02-26 17:46:45 +00:00
seek-test.c	…
seek.c	…
seek.h	…
segafilm.c	…
segment.c	avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the HLS standard	2014-03-03 16:46:22 +01:00
sierravmd.c	…
siff.c	…
smacker.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
smjpeg.c	…
smjpeg.h	…
smjpegdec.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
smjpegenc.c	…
smoothstreamingenc.c	…
smush.c	…
sol.c	…
sox.h	…
soxdec.c	…
soxenc.c	…
spdif.c	…
spdif.h	…
spdifdec.c	…
spdifenc.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
srtdec.c	…
srtenc.c	…
srtp.c	…
srtp.h	…
srtpproto.c	…
subfile.c	lavf: add subfile protocol.	2014-03-08 12:36:57 +01:00
subtitles.c	…
subtitles.h	…
subviewer1dec.c	…
subviewerdec.c	…
swf.c	…
swf.h	…
swfdec.c	…
swfenc.c	…
takdec.c	…
tcp.c	…
tedcaptionsdec.c	…
tee.c	…
thp.c	…
tiertexseq.c	…
tls.c	…
tmv.c	…
tta.c	…
tty.c	…
txd.c	…
udp.c	avformat/udp: cleanup comments, add a warning if receive buffer is unexpectedly unable to be set high enough	2014-03-22 16:40:46 +01:00
uncodedframecrcenc.c	lavf: add uncodedframecrc test muxer.	2014-02-11 10:29:02 +01:00
unix.c	…
url-test.c	…
url.c	…
url.h	…
urldecode.c	…
urldecode.h	…
utils.c	libavformat/utils.c: av_pkt_dump_log2: use const pointers	2014-04-03 13:31:13 +02:00
vc1test.c	…
vc1testenc.c	…
version.h	Write aspect ratio when muxing gif.	2014-04-02 09:49:30 +02:00
vivo.c	…
voc.c	…
voc.h	…
vocdec.c	…
vocenc.c	…
vorbiscomment.c	…
vorbiscomment.h	…
vplayerdec.c	…
vqf.c	…
w64.c	…
w64.h	…
wavdec.c	…
wavenc.c	…
wc3movie.c	…
webvttdec.c	…
webvttenc.c	…
westwood_aud.c	…
westwood_vqa.c	…
wtv.h	…
wtv_common.c	…
wtvdec.c	avformat/wtvdec: populate codec_tag from BITMAPINFOHEADER	2014-04-04 17:20:38 +02:00
wtvenc.c	avformat/wtvenc: advise user when H264 startcode is not present	2014-03-30 16:36:47 +02:00
wv.c	…
wv.h	…
wvdec.c	…
wvenc.c	…
xa.c	…
xmv.c	Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'	2014-03-11 21:05:34 +01:00
xwma.c	…
yop.c	…
yuv4mpeg.c	…