Michael Niedermayer 7acb464f0e Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90' ... * commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90': flvenc: Write proper cropping for VP6 even if there's no extradata Conflicts: libavformat/flvenc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2013-10-10 12:06:17 +02:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
act.c
adp.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c
aiffenc.c
allformats.c
amr.c	Remove an incorrect and unneeded assert in the amr demuxer.	2013-09-29 07:11:56 +02:00
anm.c
apc.c
ape.c
apetag.c
apetag.h
aqtitledec.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c	Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'	2013-10-02 14:53:00 +02:00
asfenc.c
assdec.c
assenc.c
ast.c
ast.h
astdec.c
astenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h	avformat: add support to force specific AVCodecs	2013-10-02 22:56:03 +02:00
avi.h
avidec.c	Merge commit 'ceec6e792e4b5baaa23b220f4fd33417631f5288'	2013-10-10 11:31:40 +02:00
avienc.c	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +02:00
avio_internal.h
avio.c
avio.h
aviobuf.c	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c
bfi.c	Merge commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269'	2013-09-30 00:13:36 +02:00
bink.c
bintext.c
bit.c
bluray.c
bmv.c	bmv: Remove unused variable	2013-10-06 19:36:53 +02:00
boadec.c
brstm.c
c93.c
cache.c
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c
cdg.c
cdxl.c
concat.c	Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'	2013-09-27 11:45:37 +02:00
concatdec.c
crcenc.c
crypto.c
cutils.c
data_uri.c
daud.c
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dtshddec.c
dv.c
dv.h
dvenc.c
dxa.c
eacdata.c
electronicarts.c	Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'	2013-09-29 23:52:07 +02:00
epafdec.c
ffm.h
ffmdec.c
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file_open.c
file.c
filmstripdec.c
filmstripenc.c
flacdec_picture.c
flacdec.c
flacdec.h
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c	Merge commit 'c951e4b442df9dde6051634a85359eb809bf2142'	2013-09-23 11:56:29 +02:00
flvenc.c	Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'	2013-10-10 12:06:17 +02:00
format.c
framecrcenc.c
framehash.c
frmdec.c
ftp.c
g722.c
g723_1.c
g729dec.c
gif.c
gifdec.c	avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust	2013-10-04 23:26:40 +02:00
gopher.c
gsmdec.c
gxf.c
gxf.h
gxfenc.c
h261dec.c
h263dec.c
h264dec.c
h265dec.c
hls.c
hlsenc.c
hlsproto.c
http.c	Merge commit '5c53bf7aaf03748464cbf978bffe7ffdb71112b1'	2013-09-27 10:38:04 +02:00
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.c
img2dec.c
img2enc.c
ingenientdec.c
internal.h
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c
isom.h
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	Merge remote-tracking branch 'qatar/master'	2013-09-27 13:27:31 +02:00
m4vdec.c
Makefile	avformat/output-example: Declare link dependency on libswscale in the Makefile	2013-10-03 23:23:04 +02:00
matroska.c
matroska.h
matroskadec.c	avformat/matroskadec: only set r_frame_rate if the value is within reasonable limits	2013-10-06 00:22:08 +02:00
matroskaenc.c
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +02:00
mov_chan.c
mov_chan.h
mov.c	Merge commit 'b698542ad83284fbb8c22404e3cafeb2dd739d38'	2013-10-05 10:50:47 +02:00
movenc.c	avformat/movenc: factor out find_fps()	2013-10-08 14:18:43 +02:00
movenc.h
movenchint.c
mp3dec.c
mp3enc.c
mpc8.c
mpc.c
mpeg.c	avformat/vobsub: raise packet even if apparently incomplete.	2013-10-04 09:25:11 +00:00
mpeg.h
mpegenc.c	avformat/mpegenc: check, warn and clip muxrate to syntactical possible values	2013-09-29 17:02:57 +02:00
mpegts.c	avformat/mpegts: check avio_tell() return code before using it	2013-09-26 16:43:55 +02:00
mpegts.h
mpegtsenc.c
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c	Avoid img_segment_size == 0 in mtv demuxer.	2013-09-30 07:55:23 +02:00
mux.c
mvdec.c
mvi.c	Merge commit '28ff439efd2362fb21e1a78610737f2e26a72d8f'	2013-09-29 23:24:27 +02:00
mxf.c
mxf.h
mxfdec.c	Merge commit 'ad0560fe7491a85c3e71d5a3d6a0443f10b33ab1'	2013-10-02 14:55:18 +02:00
mxfenc.c	avformat/mxfenc: instance number is just 24 bits	2013-09-29 14:33:40 +02:00
mxg.c
ncdec.c
network.c
network.h
nistspheredec.c
noproxy-test.c
nsvdec.c
nullenc.c
nut.c	pcm: support 24-bit/32-bit little-endian planar	2013-09-27 01:33:45 +02:00
nut.h
nutdec.c
nutenc.c
nuv.c
oggdec.c
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c	avformat/oggparseflac: fix handling of old flac in ogg	2013-10-07 01:36:05 +02:00
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +02:00
oggparsevorbis.c	Merge remote-tracking branch 'qatar/master'	2013-10-06 12:24:13 +02:00
oma.c	Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'	2013-09-30 02:15:36 +02:00
oma.h	Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'	2013-09-30 02:15:36 +02:00
omadec.c	Merge remote-tracking branch 'qatar/master'	2013-09-30 02:21:41 +02:00
omaenc.c
options_table.h
options.c
os_support.c
os_support.h
paf.c
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pjsdec.c
pmpdec.c
psxstr.c
pva.c
pvfdec.c
qcp.c
qtpalette.h
r3d.c
rawdec.c
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +02:00
rdt.h
realtextdec.c
redspark.c
riff.c
riff.h
riffdec.c	Merge commit 'd07aa3f02b73ab1371c13ac7898338380ca0932b'	2013-09-29 23:41:16 +02:00
riffenc.c
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	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +02:00
rtmppkt.c
rtmppkt.h
rtmpproto.c	Merge commit 'cd818b3a5709b9b08bd5901cb8863a8b61be265e'	2013-10-04 14:30:05 +02: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	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +02:00
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
rtpenc.h
rtpproto.c
rtpproto.h
rtsp.c
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c
sdp.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c
sierravmd.c
siff.c
smacker.c	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +02:00
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c	Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'	2013-09-27 12:13:41 +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
subtitles.c	avformat/vobsub: fix several issues.	2013-10-04 07:59:49 +02:00
subtitles.h	avformat/vobsub: fix several issues.	2013-10-04 07:59:49 +02:00
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	avformat/tls: fix {} error for the GNUTLS case	2013-09-27 15:59:19 +02:00
tmv.c
tta.c
tty.c
txd.c
udp.c
unix.c
url-test.c
url.c
url.h
urldecode.c
urldecode.h
utils.c	avformat: add support to force specific AVCodecs	2013-10-02 22:56:03 +02:00
vc1test.c
vc1testenc.c
version.h	avformat: add support to force specific AVCodecs	2013-10-02 22:56:03 +02:00
vivo.c
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vplayerdec.c
vqf.c	Merge commit '68ff9981283a56c731f00c2ee7901103665092fc'	2013-09-29 22:42:31 +02:00
w64.c
w64.h
wavdec.c	avformat/wavdec: Dont trust the fact chunk for PCM	2013-10-09 22:18:19 +02:00
wavenc.c
wc3movie.c
webvttdec.c
webvttenc.c
westwood_aud.c
westwood_vqa.c
wtv.c
wtv.h
wtvdec.c
wtvenc.c
wv.c
wv.h
wvdec.c
wvenc.c
xa.c
xmv.c
xwma.c	Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60'	2013-09-29 22:59:49 +02:00
yop.c
yuv4mpeg.c