1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
FFmpeg/libavformat
Michael Niedermayer b000b86e1d Merge remote branch 'qatar/master'
* qatar/master: (23 commits)
  doc: Check standalone compilation before submitting new components.
  Fix standalone compilation of pipe protocol.
  Fix standalone compilation of ac3_fixed encoder.
  Fix standalone compilation of binkaudio_dct / binkaudio_rdft decoders.
  Fix standalone compilation of IMC decoder.
  Fix standalone compilation of WTV demuxer.
  Fix standalone compilation of MXPEG decoder.
  flashsv: K&R cosmetics
  matroskaenc: fix memory leak
  vc1: make overlap filter for I-frames bit-exact.
  vc1dec: use s->start/end_mb_y instead of passing them as function args.
  Revert "VC1: merge idct8x8, coeff adjustments and put_pixels."
  Replace strncpy() with av_strlcpy().
  indeo3: Eliminate use of long.
  get_bits: make cache unsigned to eliminate undefined signed overflow.
  asfdec: fix assert failure on invalid files
  avfilter: check malloc return values.
Not pulled as reason for reindent is not pulled:  mpegvideo: reindent.
  nutenc: check malloc return values.
Not pulled due to much simpler solution in ffmpeg  *: don't av_malloc(0).
  ...

Conflicts:
	doc/developer.texi
	libavcodec/Makefile
	libavcodec/get_bits.h
	libavcodec/mpegvideo.c
	libavformat/Makefile
	libavutil/log.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-05-05 03:30:24 +02:00
..
4xm.c
a64.c
aacdec.c
ac3dec.c
adts.h
adtsenc.c
aea.c
aiff.h
aiffdec.c Move channel chunk reading function to isom.c. 2011-04-28 10:45:32 +02:00
aiffenc.c
allformats.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
amr.c
anm.c
apc.c
ape.c
apetag.c
apetag.h
applehttp.c Merge remote branch 'qatar/master' 2011-04-25 02:29:09 +02:00
applehttpproto.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
asfenc.c
assdec.c
assenc.c
au.c
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h LAVFAPI: demuxer specific options. 2011-04-30 22:09:15 +02:00
avi.c
avi.h
avidec.c Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
avienc.c
avio_internal.h
avio.c Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +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
c93.c
caf.c Move channel chunk reading function to isom.c. 2011-04-28 10:45:32 +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
cavsvideodec.c
cdg.c
concat.c
crcenc.c
crypto.c lavf: use designated initializers for AVClasses. 2011-04-29 11:39:34 +02:00
cutils.c Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
daud.c
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
eacdata.c Set channel layout for 4 and 5.1 channel cdata audio files 2011-04-25 12:13:51 +10:00
electronicarts.c
ffm.h
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
filmstripenc.c
flacdec.c
flacenc_header.c
flacenc.c
flacenc.h
flic.c
flv.h
flvdec.c
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
http.c Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
http.h
httpauth.c
httpauth.h
id3v1.c
id3v1.h
id3v2.c
id3v2.h
idcin.c
idroqdec.c
idroqenc.c
iff.c HAM6/HAM8 support for IFF demuxer/decoder 2011-04-24 12:45:19 +02:00
img2.c Add *.j2k extension to JPEG2000 decoder 2011-05-02 18:38:16 +02:00
ingenientdec.c
internal.h Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
ipmovie.c
isom.c Clarify warning messages. 2011-04-28 10:47:00 +02:00
isom.h Move channel chunk reading function to isom.c. 2011-04-28 10:45:32 +02:00
iss.c
iv8.c
ivfdec.c
ivfenc.c
jvdec.c
libavformat.v
libnut.c
librtmp.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
lmlm4.c
lxfdec.c
m4vdec.c
Makefile Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
matroska.c
matroska.h
matroskadec.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
matroskaenc.c Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +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
microdvdenc.c
mm.c
mmf.c
mms.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
mms.h
mmsh.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
mmst.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
mov.c Make DV (sub) demuxer set proper pkt->pos values. 2011-05-02 18:38:01 +02:00
movenc.c Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
movenc.h
movenchint.c
mp3dec.c
mp3enc.c Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
mpc8.c
mpc.c
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 Merge remote branch 'qatar/master' 2011-04-30 01:58:26 +02:00
mpegts.h
mpegtsenc.c Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c
mtv.c
mvi.c
mxf.c
mxf.h
mxfdec.c
mxfenc.c
mxg.c
ncdec.c
network.h Merge remote branch 'qatar/master' 2011-04-29 04:29:21 +02:00
nsvdec.c
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 Merge remote branch 'qatar/master' 2011-05-05 03:30:24 +02:00
nuv.c
oggdec.c Replace some commented-out debug printf() / av_log() messages with av_dlog(). 2011-04-29 17:27:01 +02:00
oggdec.h Ogg: add support for Xiph's CELT (Opus) codec. 2011-04-19 15:49:32 +02:00
oggenc.c
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
oggparsetheora.c
oggparsevorbis.c
oma.c Merge remote branch 'qatar/master' 2011-04-23 01:09:43 +02:00
options.c Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +02:00
os_support.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +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
psxstr.c
pva.c
qcp.c
qtpalette.h
r3d.c
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 Merge remote branch 'qatar/master' 2011-05-04 04:06:26 +02:00
riff.h
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
rpl.c
rso.c
rso.h
rsodec.c
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
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-04-24 03:41:22 +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
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.h
rtpenc_h263.c
rtpenc_h264.c
rtpenc_mpv.c
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c
rtpenc.h
rtpproto.c Merge remote branch 'qatar/master' 2011-04-20 04:48:23 +02:00
rtsp.c Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
rtsp.h
rtspcodes.h
rtspdec.c
rtspenc.c
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
seek.c
seek.h
segafilm.c
sierravmd.c
siff.c
smacker.c
sol.c
sox.h
soxdec.c
soxenc.c
spdif.c
spdif.h
spdifdec.c
spdifenc.c Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45' 2011-05-01 00:26:05 +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
timefilter.h
tmv.c
tta.c
tty.c
txd.c
udp.c Merge remote branch 'qatar/master' 2011-04-21 03:37:05 +02:00
url.h
utils.c replace deprecated FF_*_TYPE symbols with AV_PICTURE_TYPE_* 2011-05-02 16:41:41 +02:00
vc1test.c
vc1testenc.c
version.h Merge remote branch 'qatar/master' 2011-04-24 03:41:22 +02:00
voc.c
voc.h
vocdec.c
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c
wav.c
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 WTV: Add ff_ prefix to the moved fields. 2011-05-01 21:13:18 +02:00
wv.c
xa.c
xwma.c
yop.c
yuv4mpeg.c