Michael Niedermayer a72df4dadc Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9' ... * commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9': movenc: write avg_frame_rate as the framerate, not the codec timebase Merged-by: Michael Niedermayer <michaelni@gmx.at>		2014-05-29 13:07:33 +02:00
..
4xm.c	Merge commit 'd256ed78ffe202a4dcc8d625becffc716bfa3977'	2014-05-18 13:10:24 +02:00
a64.c	Merge commit '3ef6c5264b2590781b4ed556443ff49709dd45fb'	2014-05-18 13:25:18 +02:00
aacdec.c
ac3dec.c
act.c
adp.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c	Autodetect Asterisk raw pcm with extension "sln".	2014-05-22 15:15:04 +02:00
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
aqtitledec.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c
asfenc.c
assdec.c
assenc.c
ast.c
ast.h
astdec.c
astenc.c
au.c
audiointerleave.c	lavf/audiointerleave: return more meaningful error codes	2014-05-20 00:00:45 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h	Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'	2014-05-29 00:20:48 +02:00
avformatres.rc
avi.h
avidec.c
avienc.c	Refuse to mux H.264 with fourcc H264 into avi without startcode.	2014-05-23 16:20:22 +02:00
avio_internal.h
avio.c	lavf: Use av_gettime_relative()	2014-05-17 20:13:33 +02:00
avio.h
aviobuf.c	avformat/aviobuf/ff_get_line: also accept \r as end of line character	2014-05-17 23:49:05 +02:00
avisynth.c	avisynth: set duration of audio streams	2014-05-16 14:41:02 +02:00
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c
bluray.c
bmv.c
boadec.c
brstm.c
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c	Write the actual mp3 frame size when muxing into caf if available.	2014-05-26 20:28:07 +02:00
cavsvideodec.c
cdg.c
cdxl.c
cinedec.c
concat.c
concatdec.c
crcenc.c
crypto.c
cutils.c
data_uri.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsfdec.c
dsicin.c
dtsdec.c
dtshddec.c
dv.c	Merge commit '79f2c426fde6e71c40b29504112d0528b85be623'	2014-05-18 14:53:41 +02:00
dv.h
dvenc.c	lavf/dvenc: use av_fifo_alloc_array	2014-05-20 00:00:45 +02:00
dxa.c
eacdata.c
electronicarts.c
epafdec.c
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file_open.c
file.c
filmstripdec.c
filmstripenc.c
flac_picture.c
flac_picture.h
flacdec.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
flacenc_header.c	Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'	2014-05-28 12:28:23 +02:00
flacenc.c	Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'	2014-05-28 13:08:50 +02:00
flacenc.h	Merge commit '54ed488b1af583df6c9d2a73b4a44f16b7e4f82c'	2014-05-28 12:28:23 +02:00
flic.c
flv.h
flvdec.c
flvenc.c
format.c
framecrcenc.c
framehash.c	avformat/framehash: switch to AVFMT_FLAG_BITEXACT	2014-05-18 04:04:32 +02:00
frmdec.c
ftp.c	lavf/ftp: favour EPSV over PASV command	2014-05-20 00:00:45 +02:00
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c
golomb_tab.c
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
hdsenc.c
hevc.c
hevc.h
hevcdec.c
hls.c
hlsenc.c	Merge commit '34e2ce5dde073244ccb2b62f930e96fe612690f7'	2014-05-17 03:13:05 +02:00
hlsproto.c
hnm.c
http.c
http.h
httpauth.c
httpauth.h
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c
ilbc.c
img2_alias_pix.c
img2_brender_pix.c
img2.c
img2.h
img2dec.c
img2enc.c
ingenientdec.c
internal.h
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c	Don't overwrite codec_id with 0 in ff_mp4_read_dec_config_descr().	2014-05-21 22:48:11 +02:00
isom.h	Merge commit '853cc025d63ee2539fc0460dab62c5b9a3fd2043'	2014-05-19 19:21:53 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libgme.c
libmodplug.c
libnut.c
libquvi.c
librtmp.c
libssh.c
lmlm4.c
loasdec.c
log2_tab.c
lvfdec.c
lxfdec.c
m4vdec.c
Makefile	Merge commit '106b62f4ba600f24415eaded5e020aeceb23fd59'	2014-05-28 13:19:26 +02:00
matroska.c
matroska.h
matroskadec.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
matroskaenc.c	Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'	2014-05-29 12:58:55 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mlvdec.c
mm.c
mmf.c	avformat/mmf: switch to AVFMT_FLAG_BITEXACT	2014-05-18 04:04:20 +02:00
mms.c
mms.h
mmsh.c
mmst.c
mov_chan.c
mov_chan.h
mov.c	avformat/mov: allow seeking back to the begin even if nothing is marked as keyframe	2014-05-26 01:23:46 +02:00
movenc.c	Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'	2014-05-29 13:07:33 +02:00
movenc.h	Merge commit '0ba5299a805e9ccaef1a757381fc2ada4d54b8a1'	2014-05-18 22:29:27 +02:00
movenchint.c
mp3dec.c
mp3enc.c	Fix the mime types for MPEG and MPEG-TS formats	2014-05-22 23:34:59 +02:00
mpc8.c
mpc.c
mpeg.c	avformat/vobsub: do not create empty streams.	2014-05-24 11:08:34 +02:00
mpeg.h
mpegenc.c
mpegts.c
mpegts.h
mpegtsenc.c	Fix the mime types for MPEG and MPEG-TS formats	2014-05-22 23:34:59 +02:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c
mux.c	avformat/mux: Remove localized encoder strings	2014-05-20 02:46:42 +02:00
mvdec.c
mvi.c
mxf.c
mxf.h
mxfdec.c
mxfenc.c	Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52'	2014-05-15 19:16:57 +02:00
mxg.c
ncdec.c
network.c	lavf: Use av_gettime_relative()	2014-05-17 20:13:33 +02:00
network.h
nistspheredec.c
noproxy-test.c
nsvdec.c
nullenc.c
nut.c
nut.h	avformat/nutenc: add mode that omits the index	2014-05-29 03:37:37 +02:00
nutdec.c	avformat/nutdec: Fix handling of older 4.0 files	2014-05-29 01:48:02 +02:00
nutenc.c	avformat/nutenc: replace conditional by assert	2014-05-29 04:26:18 +02:00
nuv.c
oggdec.c
oggdec.h	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggenc.c	oggenc: Fix the EOS flag	2014-05-28 21:51:38 +03:00
oggparsecelt.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsedirac.c
oggparseflac.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseogm.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseopus.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparseskeleton.c
oggparsespeex.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsetheora.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsevorbis.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oggparsevp8.c	Merge commit '23f741f79327e31be7b2a75ebb2e02111e06e52f'	2014-05-28 13:02:19 +02:00
oma.c
oma.h
omadec.c
omaenc.c
options_table.h	Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'	2014-05-29 00:20:48 +02:00
options.c
os_support.c
os_support.h
paf.c
pcm.c
pcm.h
pcmdec.c	Autodetect Asterisk raw pcm with extension "sln".	2014-05-22 15:15:04 +02: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	Fix the mime types for MPEG and MPEG-TS formats	2014-05-22 23:34:59 +02:00
rawenc.h
rawvideodec.c
rdt.c	Merge commit '8692e6284f5169257a537c8fc25addf32fc67c87'	2014-05-24 13:21:33 +02:00
rdt.h
realtextdec.c
redspark.c
replaygain.c
replaygain.h
riff.c
riff.h
riffdec.c
riffenc.c	Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'	2014-05-17 20:22:56 +02:00
rl2.c
rm.c
rm.h
rmdec.c
rmenc.c
rmsipr.c
rmsipr.h
rpl.c
rsd.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmpcrypt.c
rtmpcrypt.h
rtmpdh.c
rtmpdh.h
rtmphttp.c
rtmppkt.c
rtmppkt.h
rtmpproto.c	rtmpproto: info out for unsupported auth vars	2014-05-16 17:31:48 -04:00
rtp.c
rtp.h
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
rtpdec_g726.c
rtpdec_h263_rfc2190.c
rtpdec_h263.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
rtpdec.c
rtpdec.h
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c
rtpenc_chain.h
rtpenc_h263_rfc2190.c
rtpenc_h263.c
rtpenc_h264.c
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c	avformat/rtpenc: switch to AVFMT_FLAG_BITEXACT	2014-05-18 04:02:44 +02:00
rtpenc.h
rtpproto.c
rtpproto.h
rtsp.c
rtsp.h
rtspcodes.h
rtspdec.c	avformat/rtspdec: Use av_mallocz_array()	2014-05-27 20:42:50 +02:00
rtspenc.c
samidec.c
sapdec.c
sapenc.c	lavf: Use av_gettime_relative()	2014-05-17 20:13:33 +02:00
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
sdr2.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c
sierravmd.c
siff.c
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c	Merge commit 'e0d01dc7d7fc3ce4c23f286a10870e9599c8b8b9'	2014-05-25 13:07:45 +02:00
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c
srtdec.c
srtenc.c
srtp.c
srtp.h
srtpproto.c
subfile.c
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
uncodedframecrcenc.c
unix.c
url-test.c
url.c
url.h
urldecode.c
urldecode.h
utils.c	libavformat/utils: Warning about invalid cover art instead of an error	2014-05-28 19:12:02 +02:00
vc1test.c
vc1testenc.c
version.h	Merge commit '6d212599aa684f30511fb08ca30fe2378405304e'	2014-05-29 00:20:48 +02:00
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c	Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'	2014-05-28 13:08:50 +02:00
vorbiscomment.h	Merge commit 'efcde917af407a6031ecff68edd51fce7b83d104'	2014-05-28 13:08:50 +02:00
vplayerdec.c
vqf.c
w64.c
w64.h
wavdec.c
wavenc.c	Merge commit 'd246231e4714119faac6c7acd881d3b687bb8b11'	2014-05-18 21:05:46 +02:00
wc3movie.c
webvttdec.c
webvttenc.c	avcodec/webvttenc: add webvtt encoder	2014-05-25 03:04:14 +02:00
westwood_aud.c
westwood_vqa.c
wtv_common.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
wv.h
wvdec.c
wvenc.c
xa.c
xmv.c
xwma.c
yop.c	yop: only set extradata size after it has been successfully allocated	2014-05-18 10:22:42 +02:00
yuv4mpeg.h	Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'	2014-05-18 13:37:25 +02:00
yuv4mpegdec.c	Merge commit 'b513bf6f69e26e724de6d5dca642c3582dcd0517'	2014-05-18 14:02:31 +02:00
yuv4mpegenc.c	Merge commit 'e4dc1000d7bbbcb5b45cf9849fc5315f19578e37'	2014-05-18 13:37:25 +02:00