RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2024-12-25 00:32:31 +00:00
Code Issues Projects Releases Wiki Activity
5b602a140f
ffmpeg/libavformat
History
Michael Niedermayer aedc908601 Merge remote-tracking branch 'qatar/master' 
* qatar/master: (35 commits)
  flvdec: Do not call parse_keyframes_index with a NULL stream
  libspeexdec: include system headers before local headers
  libspeexdec: return meaningful error codes
  libspeexdec: cosmetics: reindent
  libspeexdec: decode one frame at a time.
  swscale: fix signed shift overflows in ff_yuv2rgb_c_init_tables()
  Move timefilter code from lavf to lavd.
  mov: add support for hdvd and pgapmetadata atoms
  mov: rename function _stik, some indentation cosmetics
  mov: rename function _int8 to remove ambiguity, some indentation cosmetics
  mov: parse the gnre atom
  mp3on4: check for allocation failures in decode_init_mp3on4()
  mp3on4: create a separate flush function for MP3onMP4.
  mp3on4: ensure that the frame channel count does not exceed the codec channel count.
  mp3on4: set channel layout
  mp3on4: fix the output channel order
  mp3on4: allocate temp buffer with av_malloc() instead of on the stack.
  mp3on4: copy MPADSPContext from first context to all contexts.
  fmtconvert: port float_to_int16_interleave() 2-channel x86 inline asm to yasm
  fmtconvert: port int32_to_float_fmul_scalar() x86 inline asm to yasm
  ...

Conflicts:
	libavcodec/arm/h264dsp_init_arm.c
	libavcodec/h264.c
	libavcodec/h264.h
	libavcodec/h264_cabac.c
	libavcodec/h264_cavlc.c
	libavcodec/h264_ps.c
	libavcodec/h264dsp_template.c
	libavcodec/h264idct_template.c
	libavcodec/h264pred.c
	libavcodec/h264pred_template.c
	libavcodec/x86/h264dsp_mmx.c
	libavdevice/Makefile
	libavdevice/jack_audio.c
	libavformat/Makefile
	libavformat/flvdec.c
	libavformat/flvenc.c
	libavutil/pixfmt.h
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2011-10-22 01:16:41 +02:00
..
4xm.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
a64.c
aacdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ac3dec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
act.c act: correct file description comment 2011-09-26 00:24:01 +02:00
adts.h
adtsenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
aea.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
aiff.h
aiffdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
aiffenc.c
allformats.c Merge remote-tracking branch 'luzero/segment' 2011-10-17 03:38:47 +02:00
amr.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
anm.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
apc.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ape.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
apetag.c
apetag.h
applehttp.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
applehttpproto.c
asf.c
asf.h
asfcrypt.c
asfcrypt.h
asfdec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
asfenc.c Merge remote-tracking branch 'qatar/master' 2011-10-14 22:24:00 +02:00
assdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
assenc.c
au.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
audiointerleave.c
audiointerleave.h
avc.c
avc.h
avformat.h Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
avi.c
avi.h
avidec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
avienc.c avienc: Add a limit on the number of skiped frames muxed in a row. 2011-10-01 03:48:33 +02:00
avio_internal.h
avio.c
avio.h
aviobuf.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
avisynth.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
avlanguage.c
avlanguage.h
avs.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
bethsoftvid.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
bfi.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
bink.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
bintext.c idf: Improve idf_probe() so it doesnt succeed on 0 byte input 2011-10-16 02:38:02 +02:00
bit.c bit: require at least 1 frame for probing 2011-10-16 02:43:36 +02:00
c93.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
cache.c av_tempfile: Pass int log_offset, void *log_ctx 2011-10-16 21:51:28 +02:00
caf.c
caf.h
cafdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
cafenc.c
cavsvideodec.c
cdg.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
concat.c
crcenc.c
crypto.c AVOptions: rename FF_OPT_TYPE_* => AV_OPT_TYPE_* 2011-10-12 16:51:16 +02:00
cutils.c
daud.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
dfa.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
diracdec.c
dnxhddec.c
dsicin.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
dtsdec.c
dv.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
dv.h Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
dvenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
dxa.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
eacdata.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
electronicarts.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ffm.h
ffmdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ffmenc.c
ffmeta.h
ffmetadec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
ffmetaenc.c
file.c return error code if error happens 2011-10-07 22:28:07 +02:00
filmstripdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
filmstripenc.c
flacdec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
flacenc_header.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
flacenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
flacenc.h
flic.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
flv.h
flvdec.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
flvenc.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
framecrcenc.c
g723_1.c g723.1: use raw muxer 2011-10-13 16:50:20 +02:00
gif.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
gopher.c
gxf.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
gxf.h
gxfenc.c gxfenc: Replace av_realloc by av_realloc_f when relevant. 2011-09-28 18:13:52 +02:00
h261dec.c
h263dec.c
h264dec.c
http.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
http.h
httpauth.c
httpauth.h
id3v1.c
id3v1.h
id3v2.c Merge remote-tracking branch 'qatar/master' 2011-10-14 03:48:22 +02:00
id3v2.h Merge remote-tracking branch 'qatar/master' 2011-10-14 03:48:22 +02:00
idcin.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
idroqdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
idroqenc.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
iff.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
img2.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ingenientdec.c Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
internal.h Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
ipmovie.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
isom.c mov: support eac3 audio 2011-10-21 22:52:55 +02:00
isom.h
iss.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
iv8.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ivfdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ivfenc.c
jvdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
latmenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
libavformat.v fix shared lib build 2011-10-21 02:27:33 +02:00
libmodplug.c AVOptions: rename remaining FF_OPT_TYPE_* to AV_OPT_TYPE_*. 2011-10-17 07:33:10 +02:00
libnut.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
librtmp.c
lmlm4.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
loasdec.c
lxfdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
m4vdec.c
Makefile Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
matroska.c
matroska.h
matroskadec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
matroskaenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
md5enc.c
md5proto.c
metadata.c
metadata.h
microdvddec.c
microdvdenc.c
mm.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mmf.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mms.c
mms.h
mmsh.c
mmst.c
mov.c Merge remote-tracking branch 'qatar/master' 2011-10-22 01:16:41 +02:00
movenc.c Fix AMR block length for no data mode when muxing mov. 2011-10-19 11:20:48 +02:00
movenc.h
movenchint.c
mp3dec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
mp3enc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
mpc8.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mpc.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mpeg.h
mpegenc.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
mpegts.c mpegts: remove read_seek() 2011-10-21 22:35:07 +02:00
mpegts.h
mpegtsenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
mpegvideodec.c
mpjpeg.c
msnwc_tcp.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mtv.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mvi.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mxf.c mxf: Add PictureEssenceCoding UL for V210 2011-09-27 22:27:52 +02:00
mxf.h
mxfdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
mxfenc.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
mxg.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
ncdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
network.h
nsvdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
nullenc.c
nut.c
nut.h
nutdec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
nutenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
nuv.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
oggdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
oggdec.h oggdec: add support for Xiph's CELT codec 2011-09-26 13:51:29 +02:00
oggenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
oggparsecelt.c Merge remote-tracking branch 'qatar/master' 2011-10-05 04:07:59 +02:00
oggparsedirac.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
oggparseflac.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
oggparseogm.c
oggparseskeleton.c
oggparsespeex.c ogg/speex: set correct timestamp and duration for the first packet. 2011-10-20 13:06:16 -04:00
oggparsetheora.c
oggparsevorbis.c lavf: use avpriv_ prefix for ff_new_chapter(). 2011-10-20 20:57:23 +02:00
oma.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
options.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
os_support.c
os_support.h
pcm.c
pcm.h
pcmdec.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
pcmenc.c Merge remote-tracking branch 'qatar/master' 2011-09-24 22:39:52 +02:00
pmpdec.c
psxstr.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
pva.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
qcp.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
qtpalette.h
r3d.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rawdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rawdec.h Merge remote-tracking branch 'qatar/master' 2011-09-17 22:36:43 +02:00
rawenc.c g723.1: use raw muxer 2011-10-13 16:50:20 +02:00
rawenc.h
rawvideodec.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rdt.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rdt.h
riff.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
riff.h
rl2.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rm.c
rm.h
rmdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rmenc.c
rpl.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rso.c
rso.h
rsodec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rsoenc.c
rtmp.h
rtmppkt.c
rtmppkt.h
rtmpproto.c Merge remote-tracking branch 'qatar/master' 2011-09-23 00:35:31 +02:00
rtp.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
rtp.h Merge remote-tracking branch 'qatar/master' 2011-09-27 02:14:37 +02:00
rtpdec_amr.c
rtpdec_asf.c
rtpdec_formats.h
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' 2011-10-13 06:00:03 +02:00
rtpdec.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rtpenc_aac.c
rtpenc_amr.c
rtpenc_chain.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rtpenc_chain.h
rtpenc_h263.c
rtpenc_h264.c
rtpenc_latm.c
rtpenc_mpv.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
rtpenc_vp8.c
rtpenc_xiph.c
rtpenc.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
rtpenc.h Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rtpproto.c Merge remote-tracking branch 'qatar/master' 2011-10-13 06:00:03 +02:00
rtsp.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
rtsp.h Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
rtspcodes.h
rtspdec.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
rtspenc.c Merge remote-tracking branch 'qatar/master' 2011-10-18 01:54:40 +02:00
sapdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
sapenc.c
sauce.c
sauce.h
sdp.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
seek-test.c
seek.c
seek.h
segafilm.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
segment.c segmenter: loose rindex() 2011-10-17 16:51:48 +02:00
sierravmd.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
siff.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
smacker.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
sol.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
sox.h
soxdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
soxenc.c
spdif.c
spdif.h
spdifdec.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
spdifenc.c Merge remote-tracking branch 'qatar/master' 2011-10-21 02:01:26 +02:00
srtdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
swf.h
swfdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
swfenc.c
tcp.c
thp.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
tiertexseq.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
tmv.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
tta.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
tty.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
txd.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
udp.c
url.h
utils.c utils: disable debuging code at the end of av_gen_search() 2011-10-21 22:27:02 +02:00
vc1test.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
vc1testenc.c
version.h Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
voc.c
voc.h
vocdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
vocenc.c
vorbiscomment.c
vorbiscomment.h
vqf.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
wav.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
wc3movie.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
westwood.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
wtv.c lavf: replace av_new_stream->avformat_new_stream part II. 2011-10-19 17:02:11 +02:00
wtv.h
wtvdec.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
wtvenc.c act, bintext, wtvenc: use named struct initializers 2011-09-26 00:22:41 +02:00
wv.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
xa.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
xmv.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
xwma.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
yop.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00
yuv4mpeg.c Merge remote-tracking branch 'qatar/master' 2011-10-20 02:34:51 +02:00