har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
FFmpeg/libavformat
History
Michael Niedermayer b19604cc4b Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0' 
* commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0':
  lavc: Rename avpriv_mpv_find_start_code after moving out from mpegvideo

Conflicts:
	libavcodec/h264_parser.c
	libavcodec/internal.h
	libavcodec/mpeg12.c
	libavcodec/utils.c
	libavformat/mpegtsenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-03-26 13:44:09 +01:00
..
4xm.c
…
a64.c
lavc: remove unecessary a64enc include.
2013-03-17 04:38:28 +01:00
aacdec.c
…
ac3dec.c
…
act.c
…
adtsenc.c
…
adxdec.c
…
aea.c
…
afc.c
…
aiff.h
…
aiffdec.c
…
aiffenc.c
…
allformats.c
Add raw VC-1 muxer to match demuxer.
2013-03-16 13:42:53 +01:00
amr.c
…
anm.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
apc.c
…
ape.c
Merge commit '613a37eca4c7b8eefceaa3e0231c23ad090ca94f'
2013-03-26 13:14:16 +01:00
apetag.c
…
apetag.h
…
apetagenc.c
…
aqtitledec.c
…
asf.c
Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'
2013-02-10 12:39:17 +01:00
asf.h
Merge commit '84b721db366c0734fdfd23c8daaa7da7da21f761'
2013-02-10 12:39:17 +01:00
asfcrypt.c
Merge commit '48a4ffa722c0874b251de9d201babed52cef0bcb'
2013-02-06 14:25:28 +01:00
asfcrypt.h
…
asfdec.c
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
asfenc.c
Merge commit '2c328a907978b61949fd20f7c991803174337855'
2013-03-20 11:24:11 +01:00
assdec.c
…
assenc.c
…
ast.c
…
ast.h
…
astdec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
astenc.c
…
au.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
audiointerleave.c
…
audiointerleave.h
…
avc.c
…
avc.h
…
avformat.h
lavf/mux: add the flush_packets option.
2013-03-24 23:19:07 +01:00
avi.h
…
avidec.c
avidec: fix duration and bitrate of truncated files
2013-03-19 13:09:52 +01:00
avienc.c
…
avio_internal.h
…
avio.c
lavf/avio: check for : in filenames for protocols.
2013-02-28 19:30:56 +01:00
avio.h
lavf/avio: fix two extreemly unreasonble typos.
2013-03-14 23:36:30 +01:00
aviobuf.c
…
avisynth.c
AviSynth demuxer rewrite.
2013-03-21 04:11:22 +01:00
avlanguage.c
…
avlanguage.h
…
avr.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
avs.c
avformat/avs: increase probe score to preempt conflict with avxsynth
2013-03-21 04:05:51 +01:00
bethsoftvid.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
bfi.c
…
bink.c
…
bintext.c
…
bit.c
…
bluray.c
…
bmv.c
…
brstm.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
c93.c
…
cache.c
…
caf.c
…
caf.h
…
cafdec.c
…
cafenc.c
cafenc: do not leak caf->pkt_sizes
2013-02-22 13:52:43 +00:00
cavsvideodec.c
…
cdg.c
…
cdxl.c
…
concat.c
…
concatdec.c
lavf/concatdec: support seeking.
2013-03-20 20:59:24 +01:00
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
dvenc: dont fail hard if the timecode is invalid
2013-02-05 22:57:35 +01:00
dxa.c
…
eacdata.c
…
electronicarts.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
epafdec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
ffm.h
…
ffmdec.c
…
ffmenc.c
…
ffmeta.h
…
ffmetadec.c
…
ffmetaenc.c
…
file.c
…
filmstripdec.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
filmstripenc.c
…
flacdec.c
Merge commit 'ca6c3f2c53be70aa3c38e8f1292809db89ea1ba6'
2013-03-16 14:10:09 +01:00
flacenc_header.c
…
flacenc.c
…
flacenc.h
…
flic.c
…
flv.h
…
flvdec.c
Merge commit 'e671d3ad6cd7fe1d02e9b35b889a25d8c059fce9'
2013-03-02 11:41:31 +01:00
flvenc.c
…
framecrcenc.c
framecrcenc: print all side data elements, not just the first
2013-02-06 18:17:27 +01:00
framehash.c
…
frmdec.c
…
g722.c
…
g723_1.c
…
g729dec.c
…
gif.c
…
gifdec.c
…
gopher.c
…
gsmdec.c
…
gxf.c
…
gxf.h
…
gxfenc.c
…
h261dec.c
…
h263dec.c
…
h264dec.c
…
hls.c
Use the avstring.h locale-independent character type functions
2013-03-07 15:16:36 +02:00
hlsenc.c
…
hlsproto.c
Merge commit 'c7e044c61bb08b3a6e1e8063e8f4449c88b01201'
2013-03-13 12:21:43 +01:00
http.c
Use the avstring.h locale-independent character type functions
2013-03-07 15:16:36 +02:00
http.h
…
httpauth.c
Use the avstring.h locale-independent character type functions
2013-03-07 15:16:36 +02:00
httpauth.h
…
icodec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
icoenc.c
…
id3v1.c
…
id3v1.h
…
id3v2.c
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
id3v2.h
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
id3v2enc.c
…
idcin.c
Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'
2013-03-12 15:44:15 +01:00
idroqdec.c
…
idroqenc.c
…
iff.c
Merge commit '50c449ac24fbb4c03c15d2e2026cef2204b80385'
2013-03-18 17:30:53 +01:00
ilbc.c
…
img2.c
img2: WebP support
2013-03-22 14:57:27 +01:00
img2dec.c
…
img2enc.c
…
ingenientdec.c
…
internal.h
Merge remote-tracking branch 'qatar/master'
2013-02-28 13:13:04 +01:00
ipmovie.c
…
ircam.c
…
ircam.h
…
ircamdec.c
…
ircamenc.c
…
isom.c
libspeex: support ZygoAudio (quality 10 mode)
2013-03-23 15:45:58 +01:00
isom.h
…
iss.c
…
iv8.c
…
ivfdec.c
…
ivfenc.c
…
jacosubdec.c
…
jacosubenc.c
…
jvdec.c
…
latmenc.c
…
libavformat.v
dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.
2013-02-15 00:08:12 +01:00
libmodplug.c
…
libnut.c
…
librtmp.c
…
lmlm4.c
lmlm4: check packet_size against lower limit too
2013-03-19 16:30:44 +01:00
loasdec.c
…
log2_tab.c
…
lvfdec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
lxfdec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
m4vdec.c
…
Makefile
lavf: do not make a hard dep on internal subtitles helpers.
2013-03-19 14:10:24 +01:00
matroska.c
matroska: fix missing ,
2013-02-21 22:24:26 +01:00
matroska.h
matroskadec: Add support for parsing Matroska ContentEncKeyID
2013-03-20 21:29:55 +01:00
matroskadec.c
matroskadec: switch to av_assert
2013-03-22 18:04:17 +01:00
matroskaenc.c
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
md5enc.c
…
md5proto.c
…
metadata.c
…
metadata.h
…
mgsts.c
…
microdvddec.c
…
microdvdenc.c
lavf/microdvd: fix muxing.
2013-02-21 00:59:32 +01:00
mkvtimestamp_v2.c
…
mm.c
…
mmf.c
…
mms.c
…
mms.h
…
mmsh.c
…
mmst.c
…
mov_chan.c
Fix termination of mov_ch_layouts_wav array lookup
2013-03-18 23:50:35 +01:00
mov_chan.h
…
mov.c
libspeex: support ZygoAudio (quality 10 mode)
2013-03-23 15:45:58 +01:00
movenc.c
movenc: Do not flag secondary audio and subtitle tracks as enabled.
2013-03-03 12:09:38 +01:00
movenc.h
movenc: Do not flag secondary audio and subtitle tracks as enabled.
2013-03-03 12:09:38 +01:00
movenchint.c
…
mp3dec.c
mp3dec: Fix VBR bit rate parsing
2013-03-08 07:32:11 +01:00
mp3enc.c
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
mpc8.c
…
mpc.c
…
mpeg.c
lavf/vobsub: free index pseudo-packet.
2013-03-20 21:13:55 +01:00
mpeg.h
Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'
2013-03-15 13:28:38 +01:00
mpegenc.c
…
mpegts.c
Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'
2013-03-15 13:28:38 +01:00
mpegts.h
Merge commit 'b164d66e35d349de414e2f0d7365a147aba8a620'
2013-03-15 13:28:38 +01:00
mpegtsenc.c
Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'
2013-03-26 13:44:09 +01:00
mpegvideodec.c
…
mpjpeg.c
…
mpl2dec.c
…
mpsubdec.c
…
msnwc_tcp.c
…
mtv.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
mux.c
lavf/mux: add the flush_packets option.
2013-03-24 23:19:07 +01:00
mvdec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
mvi.c
Fix division by 0 due to audio frame size
2013-02-10 18:15:33 +01:00
mxf.c
…
mxf.h
…
mxfdec.c
lavf/mxfdec: read field dominance flag
2013-03-19 03:01:51 +01:00
mxfenc.c
…
mxg.c
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
ncdec.c
…
network.c
…
network.h
…
nistspheredec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
noproxy-test.c
Merge remote-tracking branch 'qatar/master'
2013-02-28 13:13:04 +01:00
nsvdec.c
…
nullenc.c
…
nut.c
…
nut.h
…
nutdec.c
nutdec: more specific return codes for decode_syncpoint()
2013-03-04 16:51:21 +01:00
nutenc.c
nutenc: only write an index if there are syncpoints
2013-02-18 20:51:54 +01:00
nuv.c
lavf: remove disabled FF_API_R_FRAME_RATE cruft
2013-03-11 18:23:50 +01:00
oggdec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
oggdec.h
…
oggenc.c
…
oggparsecelt.c
…
oggparsedirac.c
…
oggparseflac.c
…
oggparseogm.c
…
oggparseopus.c
…
oggparseskeleton.c
Merge commit '63d744e2be39466e3a734c2987cd713e0bac101e'
2013-03-14 12:30:19 +01:00
oggparsespeex.c
…
oggparsetheora.c
…
oggparsevorbis.c
Use the avstring.h locale-independent character type functions
2013-03-07 15:16:36 +02:00
oma.c
…
oma.h
…
omadec.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
omaenc.c
…
options_table.h
lavf/mux: add the flush_packets option.
2013-03-24 23:19:07 +01:00
options.c
…
os_support.c
Make ff_win32_open more robust.
2013-03-16 13:40:36 +01:00
os_support.h
avutil/os_support: use 64-bit fstat/lseek variants for MSVC as well
2013-03-12 20:06:31 +01:00
paf.c
…
pcm.c
…
pcm.h
…
pcmdec.c
…
pcmenc.c
…
pjsdec.c
…
pmpdec.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
psxstr.c
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
pva.c
…
pvfdec.c
…
qcp.c
…
qtpalette.h
…
r3d.c
lavf: remove disabled FF_API_R_FRAME_RATE cruft
2013-03-11 18:23:50 +01:00
rawdec.c
lavf: remove disabled FF_API_R_FRAME_RATE cruft
2013-03-11 18:23:50 +01:00
rawdec.h
…
rawenc.c
Add raw VC-1 muxer to match demuxer.
2013-03-16 13:42:53 +01:00
rawenc.h
…
rawvideodec.c
lavf/rawvideodec: fix/extend option descriptions
2013-02-09 14:57:10 +01:00
rdt.c
…
rdt.h
…
realtextdec.c
…
riff.c
ff_end_tag: assert that the start is aligned.
2013-02-08 12:51:52 +01:00
riff.h
dshow: Fix MSVC support, remove av_export, which was apparently unneeded anyway.
2013-02-15 00:08:12 +01:00
rl2.c
…
rm.c
…
rm.h
…
rmdec.c
rmdec: flush audio packet on seeking
2013-03-18 00:08:59 +01:00
rmenc.c
…
rmsipr.c
…
rmsipr.h
…
rpl.c
…
rso.c
…
rso.h
…
rsodec.c
Merge commit '6d97484d72e33f7dde9493a9ead1a72e2f029605'
2013-03-14 12:52:12 +01:00
rsoenc.c
…
rtmp.h
…
rtmpcrypt.c
…
rtmpcrypt.h
…
rtmpdh.c
…
rtmpdh.h
…
rtmphttp.c
Use the avstring.h locale-independent character type functions
2013-03-07 15:16:36 +02:00
rtmppkt.c
…
rtmppkt.h
…
rtmpproto.c
Merge remote-tracking branch 'qatar/master'
2013-03-20 12:03:53 +01: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
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
rtpdec_mpeg4.c
…
rtpdec_mpeg12.c
…
rtpdec_mpegts.c
…
rtpdec_qcelp.c
…
rtpdec_qdm2.c
…
rtpdec_qt.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
rtpdec_svq3.c
…
rtpdec_vp8.c
Merge remote-tracking branch 'qatar/master'
2013-03-03 11:40:37 +01:00
rtpdec_xiph.c
…
rtpdec.c
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
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
Merge commit 'f1e9398621af0bc9d166014e4ce6996bb4f141d0'
2013-03-26 13:44:09 +01:00
rtpenc_vp8.c
…
rtpenc_xiph.c
…
rtpenc.c
…
rtpenc.h
…
rtpproto.c
…
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
segment: copy metadata
2013-03-18 23:57:44 +01:00
sierravmd.c
…
siff.c
…
smacker.c
…
smjpeg.c
…
smjpeg.h
…
smjpegdec.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
smjpegenc.c
…
smoothstreamingenc.c
…
smush.c
…
sol.c
…
sox.h
…
soxdec.c
…
soxenc.c
…
spdif.c
…
spdif.h
…
spdifdec.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
spdifenc.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
srtdec.c
…
srtenc.c
…
srtp.c
…
srtp.h
…
srtpproto.c
…
subtitles.c
Merge commit '1afddbe59e96af75f1c07605afc95615569f388f'
2013-03-08 19:12:03 +01:00
subtitles.h
…
subviewer1dec.c
…
subviewerdec.c
…
swf.c
…
swf.h
…
swfdec.c
lavf/swfdec: remove 8-bit audio FIXME.
2013-02-21 00:59:31 +01:00
swfenc.c
Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size"
2013-02-17 19:56:09 +01:00
takdec.c
…
tcp.c
avformat/avdevice: add missing time.h includes
2013-03-12 15:28:22 +01:00
tedcaptionsdec.c
lavf: add AV_ to two remaining CODEC_ID_*.
2013-03-12 16:21:22 +01:00
tee.c
avformat/tee: add forgotten ret assignment
2013-03-19 15:09:10 +01:00
thp.c
…
tiertexseq.c
…
tls.c
Merge remote-tracking branch 'qatar/master'
2013-02-28 13:13:04 +01:00
tmv.c
…
tta.c
…
tty.c
Merge commit '3e2f200237af977b9253b0aff121eee27bcedb44'
2013-03-12 15:57:28 +01:00
txd.c
…
udp.c
avformat/avdevice: add missing time.h includes
2013-03-12 15:28:22 +01:00
url-test.c
…
url.h
…
urldecode.c
Use the avstring.h locale-independent character type functions
2013-03-07 15:16:36 +02:00
urldecode.h
…
utils.c
avformat: Fix infinite probing that reads the whole file
2013-03-20 17:57:00 +01:00
vc1test.c
…
vc1testenc.c
vc1testenc: give muxer same name as demuxer
2013-03-16 13:42:16 +01:00
version.h
Merge commit '85a5bc054c1290699ccbf5799ba6c4e2fbcc3530'
2013-03-13 12:55:00 +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
WAV muxer: reindent
2013-02-13 17:36:55 +00:00
wc3movie.c
…
webvttdec.c
…
westwood_aud.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
westwood_vqa.c
…
wtv.c
…
wtv.h
…
wtvdec.c
…
wtvenc.c
…
wv.c
…
wvenc.c
lavc & lavf: replace deprecated av_log* functions
2013-03-15 18:10:28 +00:00
xa.c
…
xmv.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
xwma.c
Merge commit '1ecdf8912b9ced51b3267cdcdce5e394d0a3bf8e'
2013-03-14 12:41:34 +01:00
yop.c
…
yuv4mpeg.c
…