xenia-project/FFmpeg
1
0
Fork 0
mirror of https://github.com/xenia-project/FFmpeg.git synced 2025-02-07 20:58:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
FFmpeg/libavformat
History
Michael Niedermayer 2e0c360abd Merge remote-tracking branch 'qatar/master' 
* qatar/master:
  cosmetics: Align muxer/demuxer declarations
  mpeg12: Do not change frame_pred_frame_dct flag and demote error into a warning
  avcodec: remove avcodec_guess_channel_layout()
  avutil: Add av_get_default_channel_layout()

Conflicts:
	doc/APIchanges
	libavcodec/mpeg12.c
	libavformat/cdg.c
	libavformat/matroskaenc.c
	libavformat/mpegts.c
	libavformat/nuv.c
	libavformat/wav.c
	libavutil/audioconvert.c
	libavutil/audioconvert.h
	libavutil/avutil.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2012-04-06 22:52:01 +02:00
..
4xm.c
…
a64.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
aacdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
ac3dec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
act.c
…
adts.h
…
adtsenc.c
…
adxdec.c
…
aea.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
aiff.h
…
aiffdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
aiffenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
allformats.c
"Metal Gear Solid: The Twin Snakes" demuxer
2012-03-25 12:22:06 +02:00
amr.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
anm.c
…
apc.c
…
ape.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
apetag.c
Merge remote-tracking branch 'qatar/master'
2012-02-25 04:00:43 +01:00
apetag.h
…
asf.c
…
asf.h
…
asfcrypt.c
Merge remote-tracking branch 'qatar/master'
2012-03-29 04:11:10 +02:00
asfcrypt.h
…
asfdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
asfenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
assdec.c
…
assenc.c
…
au.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
audiointerleave.c
audiointerleave: check timebase
2012-04-01 21:21:13 +02:00
audiointerleave.h
…
avc.c
Merge remote-tracking branch 'qatar/master'
2012-03-25 01:56:53 +01:00
avc.h
Merge remote-tracking branch 'qatar/master'
2012-03-25 01:56:53 +01:00
avformat.h
Add AVIO_FLAG_DIRECT.
2012-04-04 20:39:33 +02:00
avi.h
…
avidec.c
avidec: better NI detection.
2012-04-01 10:33:16 +02:00
avienc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
avio_internal.h
…
avio.c
…
avio.h
Add AVIO_FLAG_DIRECT.
2012-04-04 20:39:33 +02:00
aviobuf.c
Add AVIO_FLAG_DIRECT.
2012-04-04 20:39:33 +02:00
avisynth.c
…
avlanguage.c
…
avlanguage.h
…
avs.c
Merge remote-tracking branch 'qatar/master'
2012-03-03 00:23:10 +01:00
bethsoftvid.c
…
bfi.c
…
bink.c
…
bintext.c
…
bit.c
…
bluray.c
bluray protocol
2012-03-03 04:30:49 +01:00
bmv.c
cosmetics: Align muxer/demuxer declarations
2012-04-06 19:19:59 +03:00
c93.c
…
cache.c
…
caf.c
…
caf.h
…
cafdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
cafenc.c
…
cavsvideodec.c
…
cdg.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
cdxl.c
cdxl demux: do not create packets with uninitialized data at EOF.
2012-03-05 16:27:31 -05:00
concat.c
…
crcenc.c
…
crypto.c
…
cutils.c
…
daud.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
dfa.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
diracdec.c
…
dnxhddec.c
…
dsicin.c
…
dtsdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
dv.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
dv.h
…
dvenc.c
…
dxa.c
Merge remote-tracking branch 'qatar/master'
2012-03-01 03:17:11 +01:00
eacdata.c
…
electronicarts.c
electronicarts vp6: set duration of video stream
2012-03-22 13:15:17 +01:00
ffm.h
…
ffmdec.c
Merge remote-tracking branch 'qatar/master'
2012-03-01 03:17:11 +01:00
ffmenc.c
Merge remote-tracking branch 'qatar/master'
2012-03-01 03:17:11 +01:00
ffmeta.h
…
ffmetadec.c
…
ffmetaenc.c
…
file.c
…
filmstripdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
filmstripenc.c
…
flacdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
flacenc_header.c
…
flacenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
flacenc.h
…
flic.c
…
flv.h
flv: clarify use of video info/cmd frame.
2012-03-20 07:53:40 +01:00
flvdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
flvenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
framecrcenc.c
…
framehash.c
…
g723_1.c
…
g729dec.c
…
gif.c
Merge remote-tracking branch 'qatar/master'
2012-02-22 02:24:18 +01:00
gopher.c
…
gsmdec.c
…
gxf.c
gxf: return AVERROR_EOF instead of AVERROR(EIO) at end of gxf_packet function
2012-03-19 13:33:24 +01:00
gxf.h
…
gxfenc.c
Merge remote-tracking branch 'qatar/master'
2012-03-21 01:33:53 +01:00
h261dec.c
…
h263dec.c
…
h264dec.c
…
hls.c
Merge remote-tracking branch 'qatar/master'
2012-02-21 05:10:12 +01:00
hlsproto.c
…
http.c
Merge remote-tracking branch 'qatar/master'
2012-03-14 02:10:11 +01:00
http.h
…
httpauth.c
Merge remote-tracking branch 'qatar/master'
2012-03-14 02:10:11 +01:00
httpauth.h
Merge remote-tracking branch 'qatar/master'
2012-03-14 02:10:11 +01:00
icodec.c
…
id3v1.c
…
id3v1.h
…
id3v2.c
Merge remote-tracking branch 'qatar/master'
2012-04-02 00:17:02 +02:00
id3v2.h
Merge remote-tracking branch 'qatar/master'
2012-03-01 03:17:11 +01:00
id3v2enc.c
Merge remote-tracking branch 'qatar/master'
2012-03-01 03:17:11 +01:00
idcin.c
…
idroqdec.c
…
idroqenc.c
…
iff.c
Merge remote-tracking branch 'qatar/master'
2012-03-13 01:56:33 +01:00
img2.c
lavc: add a OpenEXR decoder
2012-04-06 08:32:09 +02:00
img2dec.c
img2dec: remove GLOB_TILDE support.
2012-03-30 05:16:15 +02:00
img2enc.c
Merge remote-tracking branch 'qatar/master'
2012-03-18 23:39:42 +01:00
ingenientdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
internal.h
Merge remote-tracking branch 'qatar/master'
2012-03-21 01:33:53 +01:00
ipmovie.c
…
isom.c
lavc: add a OpenEXR decoder
2012-04-06 08:32:09 +02:00
isom.h
MOV: Fix old-style muxed raw-audio data.
2012-03-31 12:37:42 +02:00
iss.c
…
iv8.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
ivfdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
ivfenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
jvdec.c
Merge remote-tracking branch 'qatar/master'
2012-03-15 01:27:10 +01:00
latmenc.c
…
libavformat.v
libavformat.v: add ffio_set_buf_size() for ffserver.
2012-03-12 06:04:37 +01:00
libmodplug.c
…
libnut.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
librtmp.c
…
lmlm4.c
…
loasdec.c
…
lxfdec.c
lxfdec: support version 1 files, too.
2012-03-31 12:37:42 +02:00
m4vdec.c
…
Makefile
Merge remote-tracking branch 'qatar/master'
2012-03-26 20:52:52 +02:00
matroska.c
…
matroska.h
Merge remote-tracking branch 'qatar/master'
2012-03-01 03:17:11 +01:00
matroskadec.c
matroskadec: fix strcmp(NULL)
2012-03-23 01:27:49 +01:00
matroskaenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
md5enc.c
…
md5proto.c
…
metadata.c
…
metadata.h
…
mgsts.c
Enable generic index/seeking for mgsts demuxer.
2012-03-26 20:03:57 +02:00
microdvddec.c
…
microdvdenc.c
…
mkvtimestamp_v2.c
…
mm.c
mmdemux: dont set pkt->size to an invalid value.
2012-03-23 00:50:49 +01:00
mmf.c
Fix type and codetype fields in the MMF header for some phones.
2012-03-21 22:19:23 +01:00
mms.c
…
mms.h
…
mmsh.c
…
mmst.c
…
mov_chan.c
mov: Add missing terminator to mov_ch_layout_map_1ch.
2012-03-22 13:56:44 -07:00
mov_chan.h
doxygen: Remove documentation for non-existing parameters; misc small fixes.
2012-02-28 20:48:43 +01:00
mov.c
movdec: handle 0x7fff langcode as macintosh per the specs
2012-04-06 05:41:21 +02:00
movenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
movenc.h
Merge remote-tracking branch 'qatar/master'
2012-03-21 01:33:53 +01:00
movenchint.c
…
mp3dec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mp3enc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mpc8.c
…
mpc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mpeg.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mpeg.h
…
mpegenc.c
Merge remote-tracking branch 'qatar/master'
2012-03-21 01:33:53 +01:00
mpegts.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mpegts.h
Merge remote-tracking branch 'qatar/master'
2012-02-29 00:30:35 +01:00
mpegtsenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mpegvideodec.c
mpegvideo_probe: Fix misdetection of mpeg4video files.
2012-03-09 22:25:32 +01:00
mpjpeg.c
mpjpeg: video streaming will no longer break and stop on Firefox
2012-03-10 18:32:02 +01:00
msnwc_tcp.c
…
mtv.c
…
mvi.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
mxf.c
mxf: Add DNxHD UL
2012-03-10 18:01:03 +01:00
mxf.h
Fix frame height vs field height confusion in MXF decoding.
2012-03-11 17:39:52 +01:00
mxfdec.c
mxfdec: Fix regression on files from Pinnacle Thunder
2012-04-04 17:43:17 +02:00
mxfenc.c
mxfenc: Don't allow muxing audio-only since it's not supported
2012-04-03 10:11:27 +02:00
mxg.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
ncdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
network.c
…
network.h
…
nsvdec.c
…
nullenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
nut.c
Support yuva444p rawvideo in nut.
2012-04-06 00:53:09 +02:00
nut.h
…
nutdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
nutenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
nuv.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
oggdec.c
Merge remote-tracking branch 'qatar/master'
2012-03-09 01:22:31 +01:00
oggdec.h
…
oggenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-01 00:36:43 +02:00
oggparsecelt.c
…
oggparsedirac.c
…
oggparseflac.c
Merge remote-tracking branch 'qatar/master'
2012-03-29 04:11:10 +02:00
oggparseogm.c
oggparseogm: fix order of arguments of avpriv_set_pts_info().
2012-03-22 19:51:43 +01:00
oggparseskeleton.c
vorbisdemux: Check private context in theoras gtopts.
2012-03-23 04:29:33 +01:00
oggparsespeex.c
…
oggparsetheora.c
vorbisdemux: Check private context in theoras gtopts.
2012-03-23 04:29:33 +01:00
oggparsevorbis.c
oggdec: output correct timestamps for Vorbis
2012-03-20 14:39:57 -04:00
oma.c
…
oma.h
…
omadec.c
oma: dont over-read buffer
2012-03-27 12:52:53 +02:00
omaenc.c
id3v2enc: split ff_id3v2_write().
2012-02-29 14:26:14 +01:00
options_table.h
Add AVIO_FLAG_DIRECT.
2012-04-04 20:39:33 +02:00
options.c
Merge remote-tracking branch 'qatar/master'
2012-03-21 01:33:53 +01:00
os_support.c
…
os_support.h
…
pcm.c
…
pcm.h
…
pcmdec.c
…
pcmenc.c
…
pmpdec.c
pmpdec: Check for zero audio packets.
2012-02-28 07:20:36 +01:00
psxstr.c
Merge remote-tracking branch 'qatar/master'
2012-03-04 04:26:04 +01:00
pva.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
qcp.c
…
qtpalette.h
…
r3d.c
Merge remote-tracking branch 'qatar/master'
2012-03-10 01:12:08 +01:00
rawdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
rawdec.h
…
rawenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
rawenc.h
…
rawvideodec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
rdt.c
Merge remote-tracking branch 'qatar/master'
2012-03-06 06:03:32 +01:00
rdt.h
…
riff.c
lavc: add a OpenEXR decoder
2012-04-06 08:32:09 +02:00
riff.h
…
rl2.c
Merge remote-tracking branch 'qatar/master'
2012-02-29 00:30:35 +01:00
rm.c
Merge remote-tracking branch 'qatar/master'
2012-03-20 00:03:19 +01:00
rm.h
…
rmdec.c
Merge remote-tracking branch 'qatar/master'
2012-03-20 00:03:19 +01:00
rmenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
rpl.c
…
rso.c
…
rso.h
…
rsodec.c
…
rsoenc.c
…
rtmp.h
…
rtmppkt.c
…
rtmppkt.h
…
rtmpproto.c
Merge remote-tracking branch 'qatar/master'
2012-04-04 21:17:52 +02:00
rtp.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
rtp.h
…
rtpdec_amr.c
…
rtpdec_asf.c
Merge remote-tracking branch 'qatar/master'
2012-03-21 01:33:53 +01:00
rtpdec_formats.h
…
rtpdec_g726.c
…
rtpdec_h263_rfc2190.c
…
rtpdec_h263.c
…
rtpdec_h264.c
…
rtpdec_latm.c
…
rtpdec_mpeg4.c
…
rtpdec_qcelp.c
…
rtpdec_qdm2.c
…
rtpdec_qt.c
…
rtpdec_svq3.c
…
rtpdec_vp8.c
…
rtpdec_xiph.c
…
rtpdec.c
Merge remote-tracking branch 'qatar/master'
2012-03-04 04:26:04 +01:00
rtpdec.h
…
rtpenc_aac.c
…
rtpenc_amr.c
…
rtpenc_chain.c
…
rtpenc_chain.h
…
rtpenc_h263_rfc2190.c
rtpenc: Use MB info side data for splitting H263 packets for RFC 2190
2012-03-01 16:08:32 +02:00
rtpenc_h263.c
Merge remote-tracking branch 'qatar/master'
2012-02-24 02:57:18 +01:00
rtpenc_h264.c
…
rtpenc_latm.c
…
rtpenc_mpv.c
…
rtpenc_vp8.c
…
rtpenc_xiph.c
…
rtpenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
rtpenc.h
Merge remote-tracking branch 'qatar/master'
2012-03-20 00:03:19 +01:00
rtpproto.c
…
rtsp.c
Merge remote-tracking branch 'qatar/master'
2012-03-29 04:11:10 +02:00
rtsp.h
…
rtspcodes.h
…
rtspdec.c
Merge remote-tracking branch 'qatar/master'
2012-03-20 00:03:19 +01:00
rtspenc.c
Merge remote-tracking branch 'qatar/master'
2012-03-20 00:03:19 +01:00
sapdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
sapenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
sauce.c
…
sauce.h
…
sbgdec.c
sbgdec: read_seek was undeprecated.
2012-02-23 16:00:22 +01:00
sdp.c
Merge remote-tracking branch 'qatar/master'
2012-03-29 04:11:10 +02:00
seek-test.c
Merge remote-tracking branch 'qatar/master'
2012-03-29 04:11:10 +02:00
seek.c
Merge remote-tracking branch 'qatar/master'
2012-03-06 06:03:32 +01:00
seek.h
Merge remote-tracking branch 'qatar/master'
2012-03-06 06:03:32 +01:00
segafilm.c
Merge remote-tracking branch 'qatar/master'
2012-03-04 04:26:04 +01:00
segment.c
segment: fix null pointer dereference
2012-03-22 13:43:26 +01:00
sierravmd.c
…
siff.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
smacker.c
Merge remote-tracking branch 'qatar/master'
2012-03-08 02:51:45 +01:00
smjpeg.c
…
smjpeg.h
…
smjpegdec.c
…
smjpegenc.c
…
sol.c
…
sox.h
…
soxdec.c
…
soxenc.c
…
spdif.c
…
spdif.h
…
spdifdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
spdifenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
srtdec.c
…
swf.h
swfdec: support compressed swf.
2012-04-03 19:12:52 +02:00
swfdec.c
swfdec: support compressed swf.
2012-04-03 19:12:52 +02:00
swfenc.c
Merge remote-tracking branch 'qatar/master'
2012-03-06 06:03:32 +01:00
tcp.c
Merge remote-tracking branch 'qatar/master'
2012-03-29 04:11:10 +02:00
thp.c
Merge remote-tracking branch 'qatar/master'
2012-03-04 04:26:04 +01:00
tiertexseq.c
Merge remote-tracking branch 'qatar/master'
2012-03-04 04:26:04 +01:00
tls.c
…
tmv.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
tta.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
tty.c
…
txd.c
…
udp.c
Merge remote-tracking branch 'qatar/master'
2012-03-29 04:11:10 +02:00
url.h
Merge remote-tracking branch 'qatar/master'
2012-03-20 00:03:19 +01:00
utils.c
lavf: Fix the last PTS to be generated using -fflags +genpts
2012-04-05 12:33:33 +02:00
vc1test.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
vc1testenc.c
…
version.h
"Metal Gear Solid: The Twin Snakes" demuxer
2012-03-25 12:22:06 +02:00
voc.c
…
voc.h
…
vocdec.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
vocenc.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
vorbiscomment.c
…
vorbiscomment.h
…
vqf.c
Merge remote-tracking branch 'qatar/master'
2012-03-04 04:26:04 +01:00
wav.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
wc3movie.c
…
westwood_aud.c
…
westwood_vqa.c
westwood_vqa: fix SND0 chunk handling
2012-03-27 11:58:15 -04:00
wtv.c
…
wtv.h
…
wtvdec.c
…
wtvenc.c
…
wv.c
…
xa.c
Merge remote-tracking branch 'qatar/master'
2012-03-21 01:33:53 +01:00
xmv.c
xmv: check channel number
2012-03-23 10:31:45 +01:00
xwma.c
Merge remote-tracking branch 'qatar/master'
2012-03-22 23:16:49 +01:00
yop.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00
yuv4mpeg.c
Merge remote-tracking branch 'qatar/master'
2012-04-06 22:52:01 +02:00