1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
FFmpeg/libavformat
Michael Niedermayer 80d156d7fd Merge remote-tracking branch 'qatar/master'
* qatar/master:
  qdm2: Use floating point synthesis filter.
  h264: correct border check.
  h264: fix loopfilter with threading at slice boundaries.
  Fix ff_mpa_synth_filter_fixed() prototype
  Rename costablegen.c ---> cos_tablegen.c.
  Collapse tableprint.c into tableprint.h.
  Simplify trig table rules
  Remove potentially unstable filenames from comments in generated files.
  Ignore generated tables and generated table generator programs.
  Simplify CLEANFILES make variable by using wildcards.
  Remove silly insults from avformat_version() Doxygen documentation.
  mpegaudiodsp: fix x86 and ppc makefiles
  configure: Adjust AVX assembler check.
  mpegaudio: remove unused version of SAME_HEADER_MASK
  mpegaudio: remove useless #undef at end of file
  asfdec: add missing #include for av_bswap32()
  mpegaudio: merge two #if CONFIG_FLOAT blocks
  mpegaudio: move some struct definitions from mpegaudio.h
  Move some mpegaudio functions to new mpegaudiodsp subsystem

Conflicts:
	libavcodec/h264.c
	libavcodec/x86/Makefile

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-20 05:48:22 +02:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
adts.h
adtsenc.c
aea.c
aiff.h
aiffdec.c aiffdec:Rewrite get_meta() 2011-05-06 17:39:31 +02:00
aiffenc.c Write channel_layout for multichannel aif files. 2011-05-17 01:56:01 +02:00
allformats.c Initial caf muxer. 2011-05-15 03:25:57 +02:00
amr.c
anm.c
apc.c
ape.c Fix printf format string, fixes a warning. 2011-05-07 20:14:47 +02:00
apetag.c
apetag.h
applehttp.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
applehttpproto.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
asf.c
asf.h Merge remote branch 'qatar/master' 2011-04-17 23:43:54 +02:00
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
asfenc.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
assdec.c Merge remote branch 'qatar/master' 2011-04-07 03:32:26 +02:00
assenc.c
au.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
audiointerleave.c
audiointerleave.h
avc.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2011-05-20 05:48:22 +02:00
avi.c
avi.h
avidec.c Remove unused variables. 2011-05-07 20:14:47 +02:00
avienc.c avienc: Update 2 debug statements to match the current code. 2011-05-09 17:49:25 +02:00
avio_internal.h Merge remote branch 'qatar/master' 2011-04-13 02:49:22 +02:00
avio.c lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
avio.h Merge remote branch 'qatar/master' 2011-04-29 04:29:21 +02:00
aviobuf.c Revert "Fix url_fopen() flag values." 2011-04-29 04:31:28 +02:00
avisynth.c
avlanguage.c
avlanguage.h
avs.c
bethsoftvid.c
bfi.c
bink.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
c93.c
caf.c Support decoding of amr_nb and gsm in caf. 2011-05-15 03:25:57 +02:00
caf.h Move channel chunk reading function to isom.c. 2011-04-28 10:45:32 +02:00
cafdec.c Move channel chunk reading function to isom.c. 2011-04-28 10:45:32 +02:00
cafenc.c Fix ff_mov_write_chan() so it can be used by other muxers. 2011-05-17 01:47:12 +02:00
cavsvideodec.c
cdg.c
concat.c Merge remote branch 'qatar/master' 2011-04-09 03:17:07 +02:00
crcenc.c
crypto.c lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
cutils.c Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
daud.c Merge remote branch 'qatar/master' 2011-04-10 03:32:29 +02:00
dfa.c
diracdec.c
dnxhddec.c
dsicin.c
dtsdec.c
dv.c Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
dv.h Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
dvenc.c
dxa.c Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864' 2011-04-15 04:50:06 +02:00
eacdata.c Set channel layout for 4 and 5.1 channel cdata audio files 2011-04-25 12:13:51 +10:00
electronicarts.c Use av_set_pts_info to set time_base. 2011-04-16 17:51:00 +02:00
ffm.h Merge remote branch 'qatar/master' 2011-04-09 03:17:07 +02:00
ffmdec.c Merge remote branch 'qatar/master' 2011-04-30 01:58:26 +02:00
ffmenc.c
ffmeta.h
ffmetadec.c
ffmetaenc.c
file.c Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
filmstripdec.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
filmstripenc.c
flacdec.c
flacenc_header.c
flacenc.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
flacenc.h
flic.c Replace mplayerhq.hu URLs by libav.org. 2011-04-18 18:23:16 +02:00
flv.h Move flv format #defines to common header so they can be used by the encoder too. 2011-04-01 17:38:29 +02:00
flvdec.c Merge remote-tracking branch 'qatar/master' 2011-05-18 05:42:42 +02:00
flvenc.c In mov and flv muxer, check aac bitstream validity. 2011-04-18 14:30:14 -07:00
framecrcenc.c
gif.c
gopher.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
gxf.c
gxf.h
gxfenc.c replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
h261dec.c
h263dec.c
h264dec.c h264probe: update to latest spec. 2011-05-09 16:05:29 +02:00
http.c lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
http.h Merge remote branch 'qatar/master' 2011-04-09 03:17:07 +02:00
httpauth.c
httpauth.h
id3v1.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
id3v1.h
id3v2.c id3v2: prevent unsigned integer overflow in ff_id3v2_parse() 2011-05-18 10:35:52 +02:00
id3v2.h
idcin.c Merge remote branch 'qatar/master' 2011-04-17 23:43:54 +02:00
idroqdec.c
idroqenc.c
iff.c iff/8svx: redesign 8SVX demuxing and decoding for handling stereo samples correctly 2011-05-17 00:58:33 +02:00
img2.c Add *.j2k extension to JPEG2000 decoder 2011-05-02 18:38:16 +02:00
ingenientdec.c
internal.h sdp: Allow passing AVFormatContext flags to the SDP generation 2011-05-20 01:44:10 +02:00
ipmovie.c Merge remote branch 'qatar/master' 2011-04-17 23:43:54 +02:00
isom.c Fix ff_mov_write_chan() so it can be used by other muxers. 2011-05-17 01:47:12 +02:00
isom.h Fix ff_mov_write_chan() so it can be used by other muxers. 2011-05-17 01:47:12 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c Merge remote branch 'qatar/master' 2011-04-07 03:32:26 +02:00
libavformat.v
libnut.c
librtmp.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
lmlm4.c
lxfdec.c Merge remote branch 'qatar/master' 2011-04-07 03:32:26 +02:00
m4vdec.c Fix mpeg-ps misdetected as m4v. 2011-04-03 16:40:12 +02:00
Makefile rtpenc: MP4A-LATM payload support 2011-05-20 01:44:10 +02:00
matroska.c
matroska.h
matroskadec.c matroskadec: check that pointers were initialized before accessing them 2011-05-12 18:02:28 +02:00
matroskaenc.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
md5enc.c
md5proto.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
metadata.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
metadata.h Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
microdvddec.c add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
microdvdenc.c add MicroDVD muxer and demuxer 2011-04-04 01:29:40 +02:00
mm.c
mmf.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
mms.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
mms.h Merge remote branch 'qatar/master' 2011-04-09 03:17:07 +02:00
mmsh.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
mmst.c Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
mov.c Add some forgotten const to function arguments in libavfilter & libavformat. 2011-05-17 03:05:36 +02:00
movenc.c movenc: Pass AVFormatContext flags to the SDP generation 2011-05-20 01:44:10 +02:00
movenc.h
movenchint.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
mp3dec.c
mp3enc.c lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
mpc8.c
mpc.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
mpeg.c Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-04-29 17:27:01 +02:00
mpeg.h
mpegenc.c Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-04-29 17:27:01 +02:00
mpegts.c mpegts: do not output known sized packet if an unbounded packet is already queued. 2011-05-12 13:04:58 +02:00
mpegts.h
mpegtsenc.c lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c
mtv.c
mvi.c
mxf.c
mxf.h
mxfdec.c
mxfenc.c 10l, commit that should have been stashed into the merge. 2011-04-17 23:59:00 +02:00
mxg.c
ncdec.c
network.h Merge remote branch 'qatar/master' 2011-04-29 04:29:21 +02:00
nsvdec.c If a MP3 file contains the string NSVs, the NSV probe will think it is a NSV file instead of a MP3 file. Check for 0xBEEF after a Video/Audio chunck for more accuracy. 2011-05-12 14:37:50 +02:00
nullenc.c
nut.c nut format: support PIX_FMT_BGR48LE and PIX_FMT_BGR48BE 2011-04-28 07:25:28 +02:00
nut.h
nutdec.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
nutenc.c Simplify condition. 2011-05-07 09:47:35 +02:00
nuv.c
oggdec.c Ogg demuxer: give meaningful error codes and warnings. 2011-05-17 12:39:00 +02:00
oggdec.h Ogg: add support for Xiph's CELT (Opus) codec. 2011-04-19 15:49:32 +02:00
oggenc.c Added oggpagesize option for Ogg encoding. Allows setting a preferred page size. When set, if an Ogg stream buffer has enough data, a page is made, instead of filling maximum-size pages. 2011-05-10 19:30:56 +02:00
oggparsecelt.c oggparsecelt: cosmetic: order lines more logically. 2011-04-19 23:36:29 +02:00
oggparsedirac.c
oggparseflac.c
oggparseogm.c
oggparseskeleton.c
oggparsespeex.c 10l, commit that should have been stashed into the merge. 2011-04-17 23:59:00 +02:00
oggparsetheora.c
oggparsevorbis.c
oma.c Merge remote branch 'qatar/master' 2011-04-23 01:09:43 +02:00
options.c rtpenc: MP4A-LATM payload support 2011-05-20 01:44:10 +02:00
os_support.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
os_support.h Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
output-example.c output_example: use avformat_alloc_output_context() 2011-04-30 22:09:15 +02:00
pcm.c
pcm.h
pcmdec.c
pcmenc.c
pmpdec.c Add PlayStation Portable PMP format demuxer 2011-04-06 19:30:42 +02:00
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
rawdec.c Set start_time to 0 for raw audio files. 2011-04-25 16:51:27 +02:00
rawdec.h
rawenc.c
rawenc.h
rawvideodec.c
rdt.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rdt.h
riff.c Add "DAVC" FourCC 2011-05-11 22:43:30 +02:00
riff.h Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864' 2011-04-15 04:50:06 +02:00
rl2.c
rm.c
rm.h
rmdec.c Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-04-29 17:27:01 +02:00
rmenc.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
rtmp.h
rtmppkt.c Merge remote branch 'qatar/master' 2011-04-05 02:31:56 +02:00
rtmppkt.h Merge remote branch 'qatar/master' 2011-04-09 03:17:07 +02:00
rtmpproto.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
rtp.c
rtp.h
rtpdec_amr.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_asf.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_formats.h
rtpdec_h263.c
rtpdec_h264.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_latm.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_mpeg4.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_qcelp.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_qdm2.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
rtpdec_qt.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_svq3.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_vp8.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec_xiph.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpdec.c Merge remote branch 'qatar/master' 2011-05-13 04:40:40 +02:00
rtpdec.h Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c rtpenc_chain: Pass the MP4A_LATM flag to chained muxers 2011-05-20 01:44:10 +02:00
rtpenc_chain.h Merge remote branch 'qatar/master' 2011-04-09 03:17:07 +02:00
rtpenc_h263.c
rtpenc_h264.c
rtpenc_latm.c rtpenc: MP4A-LATM payload support 2011-05-20 01:44:10 +02:00
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c rtpenc: MP4A-LATM payload support 2011-05-20 01:44:10 +02:00
rtpenc.h rtpenc: MP4A-LATM payload support 2011-05-20 01:44:10 +02:00
rtpproto.c Merge remote branch 'qatar/master' 2011-05-10 04:03:17 +02:00
rtsp.c Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
rtsp.h Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
rtspcodes.h
rtspdec.c Merge remote branch 'qatar/master' 2011-05-12 04:51:24 +02:00
rtspenc.c Merge remote branch 'qatar/master' 2011-04-09 03:17:07 +02:00
sapdec.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
sapenc.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
sauce.c
sauce.h
sdp.c Reindent 2011-05-20 01:44:10 +02:00
seek.c
seek.h
segafilm.c
sierravmd.c Merge remote branch 'qatar/master' 2011-04-02 01:54:27 +02:00
siff.c
smacker.c
sol.c
sox.h
soxdec.c
soxenc.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
spdif.c
spdif.h
spdifdec.c
spdifenc.c lavf: use designated initializers for AVClasses. 2011-05-17 23:01:42 +02:00
srtdec.c
swf.h
swfdec.c
swfenc.c Fix some passing argument from incompatible pointer type warnings. 2011-04-24 17:46:50 +02:00
tcp.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
thp.c
tiertexseq.c
timefilter.c Merge remote branch 'qatar/master' 2011-04-12 03:48:21 +02:00
timefilter.h
tmv.c
tta.c
tty.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
txd.c
udp.c cleaned up the udp.c, removed some variables and an av_log 2011-05-18 17:17:56 +02:00
url.h Merge remote branch 'qatar/master' 2011-04-14 03:21:38 +02:00
utils.c av_find_stream_info: Print more details about max anaylize duration failures. 2011-05-19 03:45:00 +02:00
vc1test.c
vc1testenc.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
version.h Bump minor after adding a caf muxer. 2011-05-16 11:24:23 +02:00
voc.c
voc.h
vocdec.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c Parse 'bext' metadata in the wav demuxer 2011-05-18 18:56:54 +02:00
wc3movie.c
westwood.c
wtv.c WTV: Add ff_ prefix to the moved fields. 2011-05-01 21:13:18 +02:00
wtv.h WTV: Add ff_ prefix to the moved fields. 2011-05-01 21:13:18 +02:00
wtvdec.c wtvdec: Avoid gmtime_r() it breaks compile on windows. 2011-05-09 04:17:24 +02:00
wv.c Merge remote branch 'qatar/master' 2011-04-04 02:15:12 +02:00
xa.c
xwma.c Merge commit '4d012eb541ed7f35e00c87035a470d9f0a24a6e8' 2011-04-16 03:55:48 +02:00
yop.c
yuv4mpeg.c