Michael Niedermayer a16c512374 Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a' ...

* commit 'c9a39cec70603f662f4c326b21b11c4f0112079a':
  matroskadec: return meaningful errors in matroska_decode_buffer
  matroskadec: fix incorrect unsigned->signed conversion

Conflicts:
	libavformat/matroskadec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

2012-09-20 13:40:47 +02:00

..

4xm.c

…

a64.c

…

aacdec.c

…

ac3dec.c

ac3dec: fix uninitialized var warning

2012-08-30 05:17:24 +02:00

act.c

…

adtsenc.c

…

adxdec.c

…

aea.c

…

aiff.h

…

aiffdec.c

Merge remote-tracking branch 'qatar/master'

2012-09-07 13:50:24 +02:00

aiffenc.c

…

allformats.c

Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b'

2012-09-13 15:22:16 +02:00

amr.c

…

anm.c

…

apc.c

…

ape.c

lavf/ape: Fix stream duration calculation

2012-08-23 15:51:51 +02:00

apetag.c

…

apetag.h

…

apetagenc.c

…

asf.c

…

asf.h

…

asfcrypt.c

…

asfcrypt.h

…

asfdec.c

asfdec: invert SAR

2012-09-12 20:35:09 +02:00

asfenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

assdec.c

…

assenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

au.c

lavf/au: check bits per coded sample.

2012-08-18 17:45:58 +02:00

audiointerleave.c

…

audiointerleave.h

…

avc.c

…

avc.h

…

avformat.h

lavf: add use_wallclock_as_timestamps

2012-08-18 19:19:47 +02:00

avi.h

…

avidec.c

avidec: workaround aac with broken block align

2012-09-18 22:39:54 +02:00

avienc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

avio_internal.h

…

avio.c

avio: replace ETIMEDOUT by EIO

2012-09-08 02:28:20 +02:00

avio.h

avio: flush the internal buffer in avio_close()

2012-09-15 18:24:49 +02:00

aviobuf.c

avio: flush the internal buffer in avio_close()

2012-09-15 18:24:49 +02:00

avisynth.c

…

avlanguage.c

…

avlanguage.h

…

avs.c

…

bethsoftvid.c

…

bfi.c

…

bink.c

…

bintext.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

bit.c

…

bluray.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

bmv.c

…

c93.c

…

cache.c

cache: Only include unistd.h if it exists

2012-09-07 19:29:58 +02:00

caf.c

…

caf.h

…

cafdec.c

Merge remote-tracking branch 'qatar/master'

2012-09-07 13:50:24 +02:00

cafenc.c

…

cavsvideodec.c

…

cdg.c

…

cdxl.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

concat.c

…

crcenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

crypto.c

crypto: Remove a stray double space

2012-08-31 23:27:27 +02:00

cutils.c

…

daud.c

…

dfa.c

…

diracdec.c

…

dnxhddec.c

…

dsicin.c

…

dtsdec.c

…

dv.c

lavf: add missing new line to some error messages

2012-09-01 15:59:30 +02:00

dv.h

…

dvenc.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

dxa.c

…

eacdata.c

…

electronicarts.c

…

ffm.h

…

ffmdec.c

…

ffmenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

ffmeta.h

…

ffmetadec.c

…

ffmetaenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

file.c

Merge remote-tracking branch 'qatar/master'

2012-09-17 15:15:43 +02:00

filmstripdec.c

filmstripdec: add new line to error message

2012-08-31 23:03:18 +02:00

filmstripenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

flacdec.c

…

flacenc_header.c

…

flacenc.c

…

flacenc.h

…

flic.c

flic: use AV_LOG_ERROR for error message

2012-08-31 23:04:05 +02:00

flv.h

…

flvdec.c

Merge remote-tracking branch 'qatar/master'

2012-09-11 15:24:22 +02:00

flvenc.c

flvenc: silence bogus warning

2012-09-18 10:31:04 +02:00

framecrcenc.c

…

framehash.c

…

g723_1.c

…

g729dec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

gif.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

gopher.c

…

gsmdec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

gxf.c

…

gxf.h

…

gxfenc.c

gxfenc: assert that the to be written data has not been truncated.

2012-09-09 14:31:44 +02:00

h261dec.c

…

h263dec.c

…

h264dec.c

…

hls.c

hls: fix min DTS code, try #2

2012-08-21 01:52:55 +02:00

hlsproto.c

…

http.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

http.h

…

httpauth.c

…

httpauth.h

…

icodec.c

…

icoenc.c

…

id3v1.c

…

id3v1.h

…

id3v2.c

id3v2: strdup the genre name explicitly.

2012-09-17 15:48:20 +02:00

id3v2.h

…

id3v2enc.c

…

idcin.c

…

idroqdec.c

…

idroqenc.c

…

iff.c

lavf: add missing new line to some error messages

2012-09-01 15:59:30 +02:00

ilbc.c

…

img2.c

…

img2dec.c

img2dec: always close AVIOContexts

2012-09-12 14:31:09 +02:00

img2enc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

ingenientdec.c

…

internal.h

lavf: factor ff_free_stream() out

2012-08-21 06:13:54 +02:00

ipmovie.c

…

isom.c

…

isom.h

Merge remote-tracking branch 'qatar/master'

2012-09-07 13:50:24 +02:00

iss.c

…

iv8.c

…

ivfdec.c

…

ivfenc.c

…

jacosubdec.c

…

jacosubenc.c

…

jvdec.c

…

latmenc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

libavformat.v

libavformat.v: export ffurl_protocol_next

2012-09-13 16:21:25 +02:00

libmodplug.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

libnut.c

…

librtmp.c

…

lmlm4.c

…

loasdec.c

…

lxfdec.c

…

m4vdec.c

…

Makefile

Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'

2012-09-19 15:13:53 +02:00

matroska.c

lavf/mkv: prefix video stereo arrays with ff_.

2012-09-16 02:58:40 +02:00

matroska.h

lavf/mkv: prefix video stereo arrays with ff_.

2012-09-16 02:58:40 +02:00

matroskadec.c

Merge commit 'c9a39cec70603f662f4c326b21b11c4f0112079a'

2012-09-20 13:40:47 +02:00

matroskaenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

md5enc.c

…

md5proto.c

…

metadata.c

…

metadata.h

…

mgsts.c

…

microdvddec.c

…

microdvdenc.c

…

mkvtimestamp_v2.c

…

mm.c

…

mmf.c

…

mms.c

…

mms.h

…

mmsh.c

…

mmst.c

…

mov_chan.c

Merge remote-tracking branch 'qatar/master'

2012-09-08 12:53:44 +02:00

mov_chan.h

mov_chan: Pass a separate AVIOContext for reading

2012-09-07 10:49:35 +03:00

mov.c

mov: fix 32/64 format type

2012-09-19 23:36:35 +02:00

movenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

movenc.h

…

movenchint.c

…

mp3dec.c

…

mp3enc.c

mp3enc: merge mp2/mp3_write_trailer

2012-09-16 14:37:50 +02:00

mpc8.c

…

mpc.c

mpc: fix seeking to the end

2012-08-27 05:23:42 +02:00

mpeg.c

…

mpeg.h

…

mpegenc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

mpegts.c

Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b'

2012-09-13 15:22:16 +02:00

mpegts.h

…

mpegtsenc.c

mpegtsenc: add forgotten ()

2012-09-10 20:57:23 +02:00

mpegvideodec.c

…

mpjpeg.c

…

msnwc_tcp.c

lavf: add missing new line to some error messages

2012-09-01 15:59:30 +02:00

mtv.c

…

mvi.c

…

mxf.c

…

mxf.h

…

mxfdec.c

mxfdec: fix index_tables check in mxf_read_seek()

2012-09-20 12:54:00 +02:00

mxfenc.c

mxfenc: support 23.976 and 24 frame rates

2012-09-20 02:40:18 +02:00

mxg.c

…

ncdec.c

…

network.c

…

network.h

…

nsvdec.c

nsvdec: change 2 commented assert() to av_assert()

2012-09-18 05:08:32 +02:00

nullenc.c

…

nut.c

nutenc: keep track of the written syncpoint count

2012-08-26 22:15:16 +02:00

nut.h

nutenc: keep track of max_pts

2012-08-26 22:15:20 +02:00

nutdec.c

Use correct format identifier for uint64_t.

2012-08-27 09:14:40 +02:00

nutenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

nuv.c

…

oggdec.c

lavf/oggdec: reword stream creation error message.

2012-09-16 18:28:52 +02:00

oggdec.h

…

oggenc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

oggparsecelt.c

…

oggparsedirac.c

…

oggparseflac.c

…

oggparseogm.c

…

oggparseopus.c

…

oggparseskeleton.c

…

oggparsespeex.c

…

oggparsetheora.c

…

oggparsevorbis.c

…

oma.c

…

oma.h

…

omadec.c

…

omaenc.c

lavf: add missing new line to some error messages

2012-09-01 15:59:30 +02:00

options_table.h

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

options.c

…

os_support.c

…

os_support.h

Merge remote-tracking branch 'qatar/master'

2012-09-13 15:35:50 +02:00

paf.c

…

pcm.c

…

pcm.h

…

pcmdec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

pcmenc.c

…

pmpdec.c

…

psxstr.c

psxstr: more correct array type.

2012-09-01 23:45:32 +02:00

pva.c

…

qcp.c

…

qtpalette.h

…

r3d.c

…

rawdec.c

…

rawdec.h

…

rawenc.c

…

rawenc.h

…

rawvideodec.c

…

rdt.c

rmdec: pass mime type to ff_rm_read_mdpr_codecdata()

2012-08-21 06:14:29 +02:00

rdt.h

…

realtextdec.c

…

riff.c

riff: Add SVQ3 fourcc

2012-09-14 14:12:52 -04:00

riff.h

…

rl2.c

…

rm.c

…

rm.h

rmdec: pass mime type to ff_rm_read_mdpr_codecdata()

2012-08-21 06:14:29 +02:00

rmdec.c

rmdec: remove unused variable

2012-09-03 22:40:41 +02:00

rmenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

rpl.c

…

rso.c

…

rso.h

…

rsodec.c

…

rsoenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

rtmp.h

…

rtmpcrypt.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

rtmpcrypt.h

…

rtmpdh.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

rtmpdh.h

…

rtmphttp.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

rtmppkt.c

…

rtmppkt.h

…

rtmpproto.c

rtmpproto: reorder some expressions to fix compilation with clang without optimizations

2012-09-12 05:17:52 +02:00

rtp.c

…

rtp.h

…

rtpdec_amr.c

…

rtpdec_asf.c

…

rtpdec_formats.h

Merge remote-tracking branch 'qatar/master'

2012-09-10 14:06:20 +02:00

rtpdec_g726.c

…

rtpdec_h263_rfc2190.c

…

rtpdec_h263.c

…

rtpdec_h264.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

rtpdec_ilbc.c

…

rtpdec_jpeg.c

Merge commit '07584eaf4a95db3f11d3bc411f9786932829e82b'

2012-09-13 15:22:16 +02:00

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_xiph: switch to av_assert()

2012-08-24 13:44:25 +02:00

rtpdec.c

Merge remote-tracking branch 'qatar/master'

2012-09-10 14:06:20 +02:00

rtpdec.h

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

rtpenc_aac.c

…

rtpenc_amr.c

…

rtpenc_chain.c

…

rtpenc_chain.h

…

rtpenc_h263_rfc2190.c

…

rtpenc_h263.c

…

rtpenc_h264.c

…

rtpenc_latm.c

…

rtpenc_mpv.c

…

rtpenc_vp8.c

…

rtpenc_xiph.c

rtpenc_xiph: switch to av_assert

2012-08-28 22:29:20 +02:00

rtpenc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

rtpenc.h

Merge commit 'd58dd4b5b5d31cfd4092e38a5f2c894eee2ab078'

2012-09-05 14:09:09 +02:00

rtpproto.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

rtsp.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

rtsp.h

…

rtspcodes.h

…

rtspdec.c

…

rtspenc.c

…

samidec.c

…

sapdec.c

…

sapenc.c

…

sauce.c

…

sauce.h

…

sbgdec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

sctp.c

…

sdp.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

seek-test.c

…

seek.c

…

seek.h

…

segafilm.c

…

segment.c

lavf/segment: Use distinct IDs for list type ext & csv

2012-09-15 22:58:12 +02:00

sierravmd.c

…

siff.c

…

smacker.c

…

smjpeg.c

…

smjpeg.h

…

smjpegdec.c

…

smjpegenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

smoothstreamingenc.c

Merge commit '1b3439b3055b083df51d7f7838ecc6b3f708b15c'

2012-09-19 15:13:53 +02:00

smush.c

smush: read subversion for version==1 too.

2012-09-09 02:36:57 +02:00

sol.c

…

sox.h

…

soxdec.c

…

soxenc.c

…

spdif.c

…

spdif.h

…

spdifdec.c

…

spdifenc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

srtdec.c

…

srtenc.c

matroskadec, matroskadec, srtenc: Read/Write duration for subtitles.

2012-08-31 20:22:49 -07:00

subtitles.c

…

subtitles.h

…

subviewerdec.c

…

swf.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

swf.h

…

swfdec.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

swfenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

tcp.c

…

thp.c

…

tiertexseq.c

…

tls.c

…

tmv.c

…

tta.c

…

tty.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

txd.c

…

udp.c

udp: pick params from AVOptions also

2012-09-15 22:13:21 +02:00

url.h

Add 'rw_timeout' into URLContext

2012-08-29 00:05:03 +02:00

urldecode.c

…

urldecode.h

…

utils.c

Remove code that duplicates existing code a few lines down.

2012-09-17 21:17:43 +02:00

vc1test.c

…

vc1testenc.c

…

version.h

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

voc.c

…

voc.h

…

vocdec.c

…

vocenc.c

…

vorbiscomment.c

…

vorbiscomment.h

…

vqf.c

…

wav.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

wc3movie.c

…

westwood_aud.c

…

westwood_vqa.c

…

wtv.c

…

wtv.h

…

wtvdec.c

wtvdec: Remove unused strings.h header

2012-09-07 18:24:50 +02:00

wtvenc.c

…

wv.c

…

wvenc.c

…

xa.c

…

xmv.c

…

xwma.c

…

yop.c

…

yuv4mpeg.c

yuv4mpeg: fix potential alignment bug

2012-09-08 13:37:35 +02:00