ffmpeg/libavformat
Michael Niedermayer f478e8500a Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf'
* commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf':
  lavf: drop the zero-sized packets hack

Conflicts:
	libavformat/mux.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-05-15 19:24:19 +02:00
..
4xm.c
Makefile Merge commit '449511740f06a4675b0066730fa45cdb764ffafc' 2014-05-13 22:40:32 +02:00
a64.c
aacdec.c Merge remote-tracking branch 'qatar/master' 2014-03-16 22:38:05 +01:00
ac3dec.c
act.c
adp.c
adtsenc.c
adxdec.c
aea.c
afc.c
aiff.h
aiffdec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
aiffenc.c
allformats.c Silicon Graphics Movie demuxer 2014-04-19 16:24:27 +02:00
amr.c Improve amr bitrate calculation for VBR files. 2014-04-11 23:38:53 +02:00
anm.c
apc.c
ape.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
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 ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
asfenc.c avformat/asfenc: honor the maximum of 63 payloads 2014-05-13 00:54:55 +02:00
assdec.c
assenc.c
ast.c
ast.h
astdec.c
astenc.c avformat/astenc: avoid using AVCodecContext.frame_number 2014-05-05 16:46:47 +02:00
au.c
audiointerleave.c lavf: use av_fifo_freep 2014-05-07 23:39:47 +02:00
audiointerleave.h
avc.c
avc.h
avformat.h Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
avformatres.rc
avi.h
avidec.c avformat/avidec: set average frame rate from header 2014-05-01 05:40:00 +02:00
avienc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02: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 Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821' 2014-04-18 00:38:07 +02:00
aviobuf.c Merge commit '32d05934abc7427bb90380a4c1ab20a15fd7d821' 2014-04-18 00:38:07 +02:00
avisynth.c avisynth: set duration of audio streams 2014-05-05 04:38:33 +02:00
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 Enable muxing ac-3 in caf. 2014-04-24 18:02:20 +02:00
cavsvideodec.c
cdg.c
cdxl.c
cinedec.c avformat/cinedec: ask for sample when biBitCount isnt supported 2014-04-06 00:34:09 +02:00
concat.c
concatdec.c lavf/concatdec: implement automatic conversions. 2014-04-29 13:25:59 +02: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
dsfdec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
dsicin.c
dtsdec.c
dtshddec.c
dv.c
dv.h
dvenc.c lavf: use av_fifo_freep 2014-05-07 23:39:47 +02:00
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 avformat/flacdec/flac_read_timestamp: free the correct packet 2014-04-16 00:23:31 +02:00
flacenc.c Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
flacenc.h
flacenc_header.c
flic.c
flv.h
flvdec.c Fix skiping typos 2014-04-27 14:50:14 +02:00
flvenc.c
format.c
framecrcenc.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
framehash.c
frmdec.c
ftp.c
g722.c
g723_1.c
g729dec.c
gif.c Force gif aspect ratio multiplication to 64bit. 2014-04-05 01:13:47 +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 avformat/h263dec/h263_probe: Check TR 2014-05-07 03:42:21 +02:00
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 avformat/hls: reduce memory usage by using dynamically allocated url/key 2014-04-12 03:14:52 +03:00
hlsenc.c Merge commit '7266e24f176389d2e81bfc7c829934f7c8ae361c' 2014-04-30 21:29:04 +02:00
hlsproto.c
hnm.c avformat/hnm: fix decoding of 256x256 video 2014-04-16 01:37:38 +02:00
http.c avformat/http: remove never twice executable loop 2014-05-14 20:44:15 +02:00
http.h
httpauth.c
httpauth.h
icodec.c avformat/ico: use avmalloc(z)_array() 2014-04-16 19:41:41 +02:00
icoenc.c avformat/ico: use avmalloc(z)_array() 2014-04-16 19:41:41 +02:00
id3v1.c
id3v1.h
id3v2.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
id3v2.h ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
id3v2enc.c
idcin.c
idroqdec.c
idroqenc.c
iff.c avformat/iff: extend IFF demuxer to decode DSDIFF 64-bit chunks 2014-04-20 00:22:20 +02: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: fix 2 unused variable warnings 2014-04-29 18:47:27 +02:00
img2_brender_pix.c avformat: add image2 brender pix demuxer 2014-03-28 23:54:51 +01:00
img2dec.c avformat/img2dec: fix typo 2014-04-14 21:40:59 +02:00
img2enc.c Allow .y as extension for image2. 2014-04-05 02:18:09 +02:00
ingenientdec.c
internal.h Various small spelling fixes. 2014-04-22 20:44:31 +02:00
ipmovie.c
ircam.c
ircam.h
ircamdec.c
ircamenc.c
isom.c Silicon Graphics RLE 8-bit video decoder 2014-04-19 16:24:26 +02:00
isom.h
iss.c
iv8.c
ivfdec.c
ivfenc.c
jacosubdec.c
jacosubenc.c
jvdec.c
latmenc.c
libavformat.v
libgme.c
libmodplug.c Fix modplug linkage on Windows. 2014-03-11 13:22:49 +01:00
libnut.c avformat/libnut: use av_mallocz_array() 2014-05-15 01:56:52 +02:00
libquvi.c
librtmp.c Merge commit '7d027b9d6d6290557cc5d4fc56f4b9ed630a7feb' 2014-04-30 21:43:56 +02:00
libssh.c
lmlm4.c
loasdec.c Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5' 2014-05-04 00:19:35 +02:00
log2_tab.c
lvfdec.c
lxfdec.c Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430' 2014-03-11 21:05:34 +01:00
m4vdec.c
matroska.c Merge commit '141fdc763c2841b572d29a2ad78513e8d5325870' 2014-05-01 16:03:30 +02:00
matroska.h matroskadec: read the CodecDelay element 2014-04-30 21:00:01 +02:00
matroskadec.c Merge commit 'eb3b5501e8b85bfea09d533314cb6920efc42639' 2014-05-01 04:29:40 +02:00
matroskaenc.c Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
mgsts.c
microdvddec.c
microdvdenc.c
mkvtimestamp_v2.c
mlvdec.c avformat/mlvdec: close any additional .Mxx files 2014-04-27 15:34:27 +02:00
mm.c
mmf.c
mms.c
mms.h
mmsh.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
mmst.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
mov.c libavformat/mov: Elimitate double reading of COVR metadata if MOV_EXPORT_ALL_METADATA is enabled 2014-05-15 03:43:37 +02:00
mov_chan.c
mov_chan.h
movenc.c Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
movenc.h Merge commit '1e9db41e2a2166be5671b088ef4ad06a40af459f' 2014-03-23 03:22:20 +01:00
movenchint.c
mp3dec.c avformat/mp3dec: check the number of frames per buffer size 2014-05-12 21:05:47 +02:00
mp3enc.c avformat/mp3enc: drop redundant and uninitialized variable 2014-04-13 20:03:24 +02:00
mpc.c
mpc8.c
mpeg.c avformat/vobsub: use av_make_q(). 2014-05-01 16:18:12 +02:00
mpeg.h lavf/mpeg.h: Remove an unused definition. 2014-04-27 14:54:29 +02:00
mpegenc.c lavf: use av_fifo_freep 2014-05-07 23:39:47 +02:00
mpegts.c mpegts: always reset pes packet state on new packet 2014-05-05 22:33:52 +02:00
mpegts.h avformat/mpegtsenc: Allow DTS audio copy to TS streams 2014-04-27 14:24:29 +02:00
mpegtsenc.c avformat/mpegtsenc: fix minor typo in omit_video_pes_length description 2014-05-11 03:20:00 +02:00
mpegvideodec.c
mpjpeg.c
mpl2dec.c
mpsubdec.c
msnwc_tcp.c
mtv.c
mux.c Merge commit 'c9281a01b78cc3f09e36300a0ca3f5824d1c74cf' 2014-05-15 19:24:19 +02:00
mvdec.c Merge commit '55ddd700c67529ff2c6c4e976673f1341bba7a82' 2014-04-19 20:17:33 +02:00
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 Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
mxg.c
ncdec.c
network.c avformat/network: use av_malloc_array() 2014-04-13 23:39:49 +02:00
network.h
nistspheredec.c
noproxy-test.c
nsvdec.c
nullenc.c
nut.c avformat/nut: support storing RFC 3389 comfort noise 2014-05-01 02:13:31 +02:00
nut.h avformat/nut: add ff_nut_audio_extra_tags to demuxer too 2014-04-09 23:37:55 +02:00
nutdec.c avformat/nut: add ff_nut_audio_extra_tags to demuxer too 2014-04-09 23:37:55 +02:00
nutenc.c
nuv.c
oggdec.c Fix dont and doesnt typos 2014-04-27 15:14:32 +02:00
oggdec.h
oggenc.c Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
oggparsecelt.c avformat/oggparsecelt: fix memleak 2014-04-26 21:31:15 +02:00
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseopus.c
oggparseskeleton.c Merge commit '92e4b643dfdafdb6528f1baffdbea2b9a028d7c0' 2014-05-01 17:26:06 +02:00
oggparsespeex.c
oggparsetheora.c
oggparsevorbis.c Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
oggparsevp8.c
oma.c
oma.h
omadec.c ff_id3v2_read: add option to limit ID3 magic number search 2014-04-19 04:25:01 +02:00
omaenc.c
options.c
options_table.h Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +02:00
os_support.c
os_support.h
paf.c Merge commit '70daeacd6ef8b354dd7d2d77ad393831a5bbf033' 2014-03-28 04:32:05 +01:00
pcm.c lavf/pcm: remove redundant check 2014-04-20 20:56:02 +02:00
pcm.h
pcmdec.c
pcmenc.c
pjsdec.c
pmpdec.c avformat/pmpdec: remove cur_dts timestamp hack 2014-04-21 01:29:08 +02:00
psxstr.c
pva.c
pvfdec.c
qcp.c
qtpalette.h
r3d.c
rawdec.c Merge commit 'f66d0c57b13c1b7102e1e353237af178960dd3c5' 2014-05-04 00:19:35 +02:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c
rdt.h
realtextdec.c
redspark.c
replaygain.c avformat/replaygain: fix mixed declaration and statement 2014-04-18 01:16:27 +02:00
replaygain.h Merge commit 'ae43c10e36197000de2f3cc99ea35727ce98a796' 2014-04-17 21:45:58 +02:00
riff.c Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd' 2014-04-23 20:47:13 +02:00
riff.h ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
riffdec.c
riffenc.c Initialize riff and wav size fields to -1 instead of 0. 2014-05-03 22:21:00 +02:00
rl2.c
rm.c
rm.h
rmdec.c Merge commit 'ef9732162cd4b593c6db28fdd352ebef21b5c1ca' 2014-05-01 17:49:57 +02: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 avformat/rtmppkt: Fix random crash 2014-04-23 15:10:42 +02:00
rtmppkt.h
rtmpproto.c Merge commit '0bacfa8d37710b904897e7cbeb8d6f96fbf75e2e' 2014-05-08 22:44:58 +02:00
rtp.c
rtp.h
rtpdec.c
rtpdec.h rtpdec: make the NTP time values unsigned. 2014-05-09 15:10:57 +02:00
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 Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
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
rtspcodes.h lavf/rtspcodes: add missing header include 2014-04-10 21:57:04 +02:00
rtspdec.c rtspdec: check for strchr returning NULL. 2014-04-06 22:04:03 +02:00
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 Use correct msvc type specifiers for ptrdiff_t and size_t. 2014-04-24 18:01:30 +02:00
sdr2.c
seek-test.c
seek.c
seek.h
segafilm.c
segment.c avformat/segment: Use av_malloc_array() 2014-05-05 23:11:04 +02: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 Merge commit 'eeadcdfd1a6f3089b6bf6e194d6ece8d3f113123' 2014-04-06 23:29:47 +02:00
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
subtitles.c
subtitles.h
subviewer1dec.c
subviewerdec.c
swf.c
swf.h
swfdec.c
swfenc.c lavf: use av_fifo_freep 2014-05-07 23:39:47 +02:00
takdec.c
tcp.c
tedcaptionsdec.c
tee.c avformat/tee: print errors for each failed bitstream filter 2014-04-26 21:08:44 +02:00
thp.c
tiertexseq.c
tls.c
tmv.c
tta.c
tty.c
txd.c Merge commit 'a4ed995cabf220029f1d0e185a6fb45eed7b4091' 2014-04-22 13:30:23 +02:00
udp.c Support broadcast destination for udp protocol 2014-05-13 15:51:41 +02:00
uncodedframecrcenc.c
unix.c
url-test.c
url.c
url.h
urldecode.c
urldecode.h
utils.c avformat/utils: if the id3 tag is too large for data after it to become available, use the full AVPROBE_SCORE_EXTENSION if extension matches 2014-05-12 20:45:36 +02:00
vc1test.c
vc1testenc.c
version.h Merge commit '0c1959b056f6ccaa2eee2c824352ba93c8e36d52' 2014-05-15 19:16:57 +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 avformat/wavdec: enlarge probe_packets for wav 2014-04-19 03:54:10 +02:00
wavenc.c Initialize riff and wav size fields to -1 instead of 0. 2014-05-03 22:21:00 +02:00
wc3movie.c
webvttdec.c
webvttenc.c
westwood_aud.c
westwood_vqa.c
wtv.h
wtv_common.c
wtvdec.c avformat/wtvdec: ignore mpeg2 extradata 2014-05-01 18:36:27 +02:00
wtvenc.c ff_put_wav_header: add flag to force WAVEFORMATEX 2014-04-30 16:41:35 +02:00
wv.c
wv.h
wvdec.c
wvenc.c
xa.c
xmv.c avformat/xmv: use av_malloc_array() 2014-04-15 13:51:48 +02:00
xwma.c avformat/xwma: fix memleak of dpds_table 2014-04-29 20:48:03 +02:00
yop.c
yuv4mpeg.c