ffmpeg/libavformat
Michael Niedermayer 750cf4e537 Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8'
* commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8':
  movenc: write the display transform matrix

Conflicts:
	libavformat/movenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-03-20 01:10:06 +01:00
..
4xm.c
Makefile Merge commit '4326bc364b58e97fc3d89417054a6b7610179a00' 2015-03-17 21:09:43 +01:00
a64.c
aacdec.c
ac3dec.c
act.c
adp.c
adtsenc.c
adxdec.c avformat/adxdec: set avctx->channels in adx_read_header 2015-03-05 15:57:48 +01:00
aea.c
afc.c
aiff.h
aiffdec.c avformat/aiffdec: do not fail if header parser hits EOF 2015-03-19 01:44:14 +01:00
aiffenc.c
allformats.c
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
apngdec.c
aqtitledec.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde' 2015-03-03 21:16:31 +01:00
asfenc.c asfenc: fix leaking asf->index_ptr on error 2015-03-11 20:24:59 +01:00
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/avformat: improve the text about headerless formats in avformat_flush() 2015-03-05 00:09:26 +01:00
avformatres.rc
avi.h
avidec.c avformat/avidec: also print frame_num in debug output 2015-03-19 16:36:29 +01:00
avienc.c avformat/avienc: Expand master ODML index when its end is reached 2015-03-19 18:17:16 +01:00
avio.c Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda' 2015-03-12 12:38:20 +01:00
avio.h libavformat/avio: added avio_put_str16be 2015-03-03 17:49:15 +01:00
avio_internal.h Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31' 2015-02-28 23:02:42 +01:00
aviobuf.c Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda' 2015-03-12 12:38:20 +01:00
avisynth.c
avlanguage.c
avlanguage.h
avr.c
avs.c
bethsoftvid.c
bfi.c
bink.c
bintext.c
bit.c avformat/bit: only accept the g729 codec and 1 channel 2015-02-26 23:19:39 +01:00
bluray.c
bmv.c
boadec.c
brstm.c
c93.c
cache.c fix spelling errors 2015-03-06 21:35:00 +01:00
caf.c
caf.h
cafdec.c
cafenc.c
cavsvideodec.c avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe() 2015-03-16 15:40:10 +01:00
cdg.c
cdxl.c
cinedec.c
concat.c
concatdec.c
crcenc.c
crypto.c
cutils.c
dashenc.c Merge commit '3041183677bda0a431b36e96a2c76617abaa8183' 2015-03-19 12:18:05 +01:00
data_uri.c
dauddec.c
daudenc.c
dfa.c
diracdec.c
dnxhddec.c
dsfdec.c
dsicin.c
dss.c avformat/dss: implement seeking 2015-02-26 02:06:10 +01:00
dtsdec.c Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302' 2015-03-04 19:28:53 +01:00
dtshddec.c
dump.c
dv.c
dv.h
dvbsub.c avformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe() 2015-03-15 13:45:31 +01:00
dvenc.c
dxa.c
eacdata.c
electronicarts.c
epafdec.c
ffm.h
ffmdec.c ffmdec: limit the backward seek to the last resync position 2015-03-09 15:19:34 +01:00
ffmenc.c avformat/ffmenc: Use ffio_free_dyn_buf() 2015-02-27 13:38:43 +01:00
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c
file_open.c
filmstripdec.c
filmstripenc.c
flac_picture.c
flac_picture.h
flacdec.c
flacenc.c
flacenc.h
flacenc_header.c
flic.c
flv.h
flvdec.c avformat/flvdec: add support for OnCaption 2015-03-13 16:25:27 +01:00
flvenc.c Merge commit 'e767c9e8f2eaa116b61b8b6881b401b54bd320f5' 2015-03-04 20:47:14 +01:00
format.c
framecrcenc.c
framehash.c
frmdec.c
ftp.c
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 avformat/hls: refactor repeated HLS option updates 2015-03-16 13:01:39 +01:00
hlsenc.c
hlsproto.c
hnm.c
http.c avformat/http: replace cookies with updated values instead of appending forever 2015-03-18 19:53:26 +01:00
http.h
httpauth.c
httpauth.h
icecast.c
icodec.c
icoenc.c
id3v1.c
id3v1.h
id3v2.c Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a' 2015-02-25 00:48:50 +01:00
id3v2.h
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c
ilbc.c
img2.c
img2.h
img2_alias_pix.c
img2_brender_pix.c
img2dec.c
img2enc.c
ingenientdec.c
internal.h
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c' 2015-03-17 20:05:53 +01:00
isom.h mov: Add option to keep exact packet sequence after seeking 2015-03-18 14:30:07 +00: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
libsmbclient.c
libssh.c lavf/libssh: support reading config from ~/.ssh/config 2015-03-11 01:34:37 +01:00
lmlm4.c
loasdec.c
log2_tab.c
lrc.c
lrc.h
lrcdec.c
lrcenc.c
lvfdec.c
lxfdec.c
m4vdec.c
matroska.c mkv: Add support for DVB subtitles 2015-03-15 23:49:17 +01:00
matroska.h
matroskadec.c Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd' 2015-03-12 23:51:44 +01:00
matroskaenc.c lavf/mkv: Ignore ff_isom_write_hvcc() return value as the mov muxer does. 2015-03-18 20:35:26 +01:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mlvdec.c
mm.c
mmf.c
mms.c
mms.h
mmsh.c
mmst.c
mov.c mov: Add option to keep exact packet sequence after seeking 2015-03-18 14:30:07 +00:00
mov_chan.c
mov_chan.h
movenc.c Merge commit 'cf18e777aed9f73011c7ab7cbab8003189d4b9d8' 2015-03-20 01:10:06 +01:00
movenc.h Merge commit '67a2912307c3c08f2725ccae162cfe3426b80184' 2015-03-19 13:38:25 +01:00
movenchint.c Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a' 2015-02-25 00:48:50 +01:00
mp3dec.c Merge commit 'fe99c52fa99e44961a09cd1324aefd492b797fc8' 2015-03-11 20:21:16 +01:00
mp3enc.c
mpc.c
mpc8.c
mpeg.c
mpeg.h
mpegenc.c avformat/mpegenc: Ignore max_delay if no other options remain 2015-03-01 16:47:36 +01:00
mpegts.c avformat/mpegts: Fix potential pointer overflows 2015-03-16 22:37:46 +01:00
mpegts.h
mpegtsenc.c Allow muxing h264 into ts with startcode "001" instead of "0001". 2015-02-25 15:08:33 +01:00
mpegvideodec.c avformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe() 2015-03-15 13:39:56 +01:00
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c
mux.c
mvdec.c
mvi.c
mxf.c lavf/mxf: Support ProRes decoding. 2015-03-04 23:48:41 +01:00
mxf.h libavformat/mxfdec: export user comments metadata 2015-03-14 22:46:18 +01:00
mxfdec.c libavformat/mxfdec: fix MXFPackage->comment_refs memory leak 2015-03-16 03:37:44 +01:00
mxfenc.c mxfenc: don't try to write footer without header 2015-03-19 02:20:30 +01:00
mxg.c
ncdec.c
network.c
network.h
nistspheredec.c
noproxy-test.c
nsvdec.c
nullenc.c
nut.c
nut.h
nutdec.c nutdec: Prevent leaks on memory error 2015-03-12 15:29:59 +00:00
nutenc.c Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a' 2015-02-25 00:48:50 +01:00
nuv.c
oggdec.c
oggdec.h
oggenc.c
oggparsecelt.c
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c
oggparsevp8.c
oma.c
oma.h
omadec.c
omaenc.c
options.c Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31' 2015-02-28 23:02:42 +01:00
options_table.h
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 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac' 2015-03-05 01:40:03 +01:00
rdt.h
realtextdec.c
redspark.c
replaygain.c
replaygain.h
riff.c Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995' 2015-03-17 20:48:39 +01:00
riff.h avformat: Add prefix to get_codec_guid() 2015-02-27 19:25:27 +01:00
riffdec.c
riffenc.c avformat: Add prefix to get_codec_guid() 2015-02-27 19:25:27 +01:00
rl2.c
rm.c
rm.h
rmdec.c rmdec: Improve message for demux error 2015-03-08 02:35:04 +00:00
rmenc.c Merge commit 'bb4edddd9389cc1601db618ed3c1375b62628d04' 2015-03-05 20:24:58 +01:00
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
rtp.c
rtp.h
rtpdec.c rtpdec: experimental VP9 depacketizer (draft 0) 2015-03-05 10:05:44 +02:00
rtpdec.h Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_ac3.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_amr.c Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a' 2015-02-25 00:03:52 +01:00
rtpdec_asf.c Merge commit '15621cbbe4ed88409ef40257afaf239487964e98' 2015-03-05 01:12:19 +01:00
rtpdec_dv.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_formats.h rtpdec: experimental VP9 depacketizer (draft 0) 2015-03-05 10:05:44 +02:00
rtpdec_g726.c
rtpdec_h261.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_h263.c Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4' 2015-02-24 22:34:08 +01:00
rtpdec_h263_rfc2190.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_h264.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_hevc.c Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530' 2015-03-09 20:00:11 +01:00
rtpdec_ilbc.c Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74' 2015-02-24 23:44:25 +01:00
rtpdec_jpeg.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_latm.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_mpa_robust.c Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f' 2015-03-04 11:31:55 +01:00
rtpdec_mpeg4.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_mpeg12.c Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4' 2015-02-24 22:34:08 +01:00
rtpdec_mpegts.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_qcelp.c Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8' 2015-02-24 22:55:20 +01:00
rtpdec_qdm2.c Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8' 2015-02-24 22:55:20 +01:00
rtpdec_qt.c Merge commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b' 2015-03-05 01:20:25 +01:00
rtpdec_svq3.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_vp8.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpdec_vp9.c Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51' 2015-03-11 20:28:45 +01:00
rtpdec_xiph.c Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd' 2015-02-25 00:58:39 +01:00
rtpenc.c Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f' 2015-03-01 01:31:49 +01:00
rtpenc.h Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb' 2015-02-24 23:30:51 +01:00
rtpenc_aac.c Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f' 2015-03-01 01:31:49 +01:00
rtpenc_amr.c Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f' 2015-03-01 01:31:49 +01:00
rtpenc_chain.c Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a' 2015-02-25 00:48:50 +01:00
rtpenc_chain.h
rtpenc_h261.c
rtpenc_h263.c
rtpenc_h263_rfc2190.c
rtpenc_h264_hevc.c Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb' 2015-02-24 23:30:51 +01:00
rtpenc_jpeg.c
rtpenc_latm.c
rtpenc_mpegts.c Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc' 2015-03-10 11:17:37 +01:00
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f' 2015-03-01 01:31:49 +01:00
rtpproto.c
rtpproto.h
rtsp.c avformat/rtsp: Fix potential pointer overflow in sdp_probe() 2015-03-16 22:40:36 +01:00
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
samidec.c
sapdec.c
sapenc.c
sauce.c
sauce.h
sbgdec.c
sctp.c Merge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24' 2015-03-15 22:43:10 +01:00
sdp.c
sdr2.c
seek-test.c
segafilm.c
segment.c
sierravmd.c
siff.c avformat/siff: Fix checks and variable types 2015-03-09 21:05:29 +01:00
smacker.c
smjpeg.c
smjpeg.h
smjpegdec.c
smjpegenc.c
smoothstreamingenc.c
smush.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302' 2015-03-04 19:28:53 +01:00
srtdec.c
srtenc.c
srtp.c
srtp.h
srtpproto.c
stldec.c
subfile.c
subtitles.c
subtitles.h
subviewer1dec.c
subviewerdec.c
supdec.c
swf.c
swf.h
swfdec.c
swfenc.c lavf: Explicitly convert types at function pointer assignment 2015-03-11 23:53:13 +01:00
takdec.c
tcp.c Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75' 2015-02-28 23:20:39 +01:00
tedcaptionsdec.c
tee.c
thp.c
tiertexseq.c
tls.c Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919' 2015-02-28 23:32:33 +01:00
tmv.c
tta.c
tty.c
txd.c
udp.c Merge commit '8dc72eeaf647736c287b59a3856a11904bedd58b' 2015-03-19 11:22:39 +01:00
uncodedframecrcenc.c
unix.c
url-test.c
url.c
url.h
urldecode.c
urldecode.h
utils.c avformat: add avformat_flush() 2015-03-05 00:09:26 +01:00
vc1test.c
vc1testenc.c
version.h Merge commit '8692d74b7364b405d7939c0ed347e8a2815193a7' 2015-03-18 21:15:18 +01: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
webmdashenc.c
webpenc.c
webvttdec.c
webvttenc.c
westwood_aud.c
westwood_vqa.c
wtv.h
wtv_common.c
wtvdec.c
wtvenc.c avformat: Add prefix to get_codec_guid() 2015-02-27 19:25:27 +01:00
wv.c
wv.h
wvdec.c
wvenc.c
xa.c
xmv.c
xwma.c
yop.c
yuv4mpeg.h
yuv4mpegdec.c
yuv4mpegenc.c