Michael Niedermayer 78ac7ee970 Merge commit '5d471b73d20616f5ac701ff62e5de49465cda264' ...

* commit '5d471b73d20616f5ac701ff62e5de49465cda264':
  rtpdec: K&R formatting and spelling cosmetics
  cosmetics: Fix dropable --> droppable typo

Conflicts:
	libavcodec/h264.c

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

2012-12-10 01:27:10 +01:00

..

4xm.c

check std tag size before reading.

2012-12-01 00:30:11 +01:00

a64.c

…

aacdec.c

…

ac3dec.c

…

act.c

…

adtsenc.c

…

adxdec.c

…

aea.c

…

afc.c

AFC demuxer

2012-11-27 10:17:28 +00:00

aiff.h

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

aiffdec.c

…

aiffenc.c

…

allformats.c

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

amr.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

anm.c

…

apc.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

ape.c

lavf/apedec: return meaningful error codes

2012-12-06 17:17:49 +00:00

apetag.c

Merge remote-tracking branch 'qatar/master'

2012-11-22 15:36:50 +01:00

apetag.h

…

apetagenc.c

…

asf.c

…

asf.h

…

asfcrypt.c

…

asfcrypt.h

…

asfdec.c

asfdec: check extradata size before alloc and read

2012-12-02 20:44:58 +01:00

asfenc.c

…

assdec.c

lavf/assdec: return appropriate error code instead of -1.

2012-12-02 00:06:03 +01:00

assenc.c

…

ast.c

AST Muxer

2012-12-04 11:25:46 +00:00

ast.h

AST Muxer

2012-12-04 11:25:46 +00:00

astdec.c

AST Muxer

2012-12-04 11:25:46 +00:00

astenc.c

AST Muxer

2012-12-04 11:25:46 +00:00

au.c

audec: use ff_pcm_read_packet()

2012-12-05 12:40:57 +00:00

audiointerleave.c

…

audiointerleave.h

…

avc.c

…

avc.h

…

avformat.h

av_register_protocol is gone :(

2012-12-04 17:01:27 +00:00

avi.h

…

avidec.c

Correctly skip strf tag for subtitles when decoding avi.

2012-11-30 10:18:37 +01:00

avienc.c

lavf/avienc: return proper error codes, and provide some more feedback

2012-11-17 11:15:00 +01:00

avio_internal.h

…

avio.c

…

avio.h

…

aviobuf.c

Merge remote-tracking branch 'qatar/master'

2012-12-09 14:08:01 +01:00

avisynth.c

…

avlanguage.c

…

avlanguage.h

…

avr.c

avr: use ff_pcm_read_packet()

2012-12-05 12:40:57 +00:00

avs.c

…

bethsoftvid.c

bethsoftvid: signal EOF

2012-11-21 23:22:38 +01:00

bfi.c

bfi: signal EOF

2012-11-21 23:22:38 +01:00

bink.c

bink: return AVERROR_EOF upon reaching end of file

2012-11-21 19:25:20 +01:00

bintext.c

…

bit.c

…

bluray.c

…

bmv.c

…

brstm.c

brstm: do not return partial packets

2012-12-07 17:55:45 +00:00

c93.c

c93: signal EOF

2012-11-24 15:04:32 +00:00

cache.c

…

caf.c

Support iLBC in caf.

2012-11-19 10:19:50 +01:00

caf.h

…

cafdec.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

cafenc.c

cafenc: do not include riff.h

2012-12-05 20:44:28 +00:00

cavsvideodec.c

…

cdg.c

…

cdxl.c

cdxl: use url_feof()

2012-11-21 16:39:44 +00:00

concat.c

…

concatdec.c

lavf: add a concat demuxer.

2012-12-06 14:09:14 +01:00

crcenc.c

…

crypto.c

…

cutils.c

…

daud.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

dfa.c

…

diracdec.c

…

dnxhddec.c

…

dsicin.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

dtsdec.c

…

dtshddec.c

…

dv.c

dvdec: check ipcm more completely, avoid assert failure.

2012-11-13 21:45:53 +01:00

dv.h

…

dvenc.c

…

dxa.c

lavf/dxa: return meaningful error codes

2012-12-05 20:18:04 +00:00

eacdata.c

…

electronicarts.c

electronicarts: check size before reading duration out of a chunk.

2012-11-17 20:43:56 +01:00

epafdec.c

Ensoniq Paris Audio File demuxer

2012-12-05 13:01:22 +00:00

ffm.h

…

ffmdec.c

…

ffmenc.c

…

ffmeta.h

…

ffmetadec.c

…

ffmetaenc.c

…

file.c

file: fix 10l error in access() check

2012-11-27 13:24:00 +01:00

filmstripdec.c

…

filmstripenc.c

…

flacdec.c

…

flacenc_header.c

…

flacenc.c

…

flacenc.h

…

flic.c

…

flv.h

…

flvdec.c

flvdec: disable hack that attempts to parse aac bitstream in the flv demuxer.

2012-11-17 18:49:08 +01:00

flvenc.c

…

framecrcenc.c

…

framehash.c

…

g722.c

…

g723_1.c

…

g729dec.c

…

gif.c

…

gifdec.c

gifdec: do not handle timestamps

2012-12-04 15:21:24 +00:00

gopher.c

…

gsmdec.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

gxf.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

gxf.h

…

gxfenc.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

h261dec.c

…

h263dec.c

…

h264dec.c

…

hls.c

lavf/hls: whitespace cosmetics after 23db5418.

2012-11-21 08:01:51 +01:00

hlsenc.c

Merge commit '18e6f087c4a50bede8449ee164778945480be50c'

2012-12-09 13:35:49 +01:00

hlsproto.c

…

http.c

http/utils: rename "demuxer" to mime_type

2012-12-10 01:00:16 +01:00

http.h

…

httpauth.c

…

httpauth.h

…

icodec.c

…

icoenc.c

add forgotten AV_ prefix to some CODEC_IDs

2012-12-09 01:47:58 +00:00

id3v1.c

…

id3v1.h

…

id3v2.c

id3v2: check index against buffer size. Fix out of array access

2012-11-29 23:12:42 +01:00

id3v2.h

…

id3v2enc.c

…

idcin.c

…

idroqdec.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

idroqenc.c

…

iff.c

iff demuxer: include DEEP TVDC lookup table in extradata buffer

2012-12-04 20:53:26 +11:00

ilbc.c

…

img2.c

Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'

2012-11-30 14:49:13 +01:00

img2dec.c

Add exception for "gif" in image2 probe() method.

2012-11-30 14:35:11 +00:00

img2enc.c

Merge commit '9d46eaec7a90bd8f5cd9e45398c6d17804182320'

2012-11-30 14:49:13 +01:00

ingenientdec.c

…

internal.h

Merge commit '5c7bf2dddee5bdfa247ff0d57cb8a37d19077f66'

2012-11-29 14:00:44 +01:00

ipmovie.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

ircam.c

add forgotten AV_ prefix to some CODEC_IDs

2012-12-09 01:47:58 +00:00

ircam.h

IRCAM demuxer & muxer

2012-12-05 13:01:22 +00:00

ircamdec.c

IRCAM demuxer & muxer

2012-12-05 13:01:22 +00:00

ircamenc.c

ircamenc: 10l do not use avio_skip()

2012-12-05 13:46:35 +00:00

isom.c

ff_mp4_read_dec_config_descr: check that the codec is not open

2012-12-03 17:27:52 +01:00

isom.h

…

iss.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

iv8.c

…

ivfdec.c

…

ivfenc.c

…

jacosubdec.c

lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.

2012-12-02 00:06:03 +01:00

jacosubenc.c

…

jvdec.c

Merge commit 'ef1b23ad21e3f12fc4ff2a73a6d4d4cd9d630c4b'

2012-11-13 10:55:07 +01:00

latmenc.c

…

libavformat.v

…

libmodplug.c

…

libnut.c

…

librtmp.c

…

lmlm4.c

…

loasdec.c

…

log2_tab.c

…

lvfdec.c

…

lxfdec.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

m4vdec.c

…

Makefile

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

matroska.c

…

matroska.h

…

matroskadec.c

matroskadec: reset size when freeing data.

2012-12-04 03:50:09 +01:00

matroskaenc.c

…

md5enc.c

…

md5proto.c

…

metadata.c

…

metadata.h

…

mgsts.c

…

microdvddec.c

lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.

2012-12-02 00:06:03 +01:00

microdvdenc.c

…

mkvtimestamp_v2.c

…

mm.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

mmf.c

mmfdec: fix seeking

2012-12-06 11:56:00 +00:00

mms.c

…

mms.h

…

mmsh.c

…

mmst.c

…

mov_chan.c

…

mov_chan.h

…

mov.c

Merge commit 'd7d6efe42b0d2057e67999b96b9a391f533d2333'

2012-12-07 15:52:43 +01:00

movenc.c

movenc: fix assert failure caused by rounding.

2012-11-22 20:58:06 +01:00

movenc.h

…

movenchint.c

Merge remote-tracking branch 'qatar/master'

2012-11-15 11:31:13 +01:00

mp3dec.c

…

mp3enc.c

lavf/mp3enc: make sure the header is valid before writing audio pkt.

2012-11-16 14:11:08 +01:00

mpc8.c

mpc8: check seektable size before attempting to use it.

2012-12-02 04:21:42 +01:00

mpc.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

mpeg.c

lavf: VobSub demuxer.

2012-12-07 21:18:06 +01:00

mpeg.h

…

mpegenc.c

…

mpegts.c

mpegts: demux asynchronous SMPTE 336M Key-Length-Value (KLV) metadata

2012-12-09 17:15:46 +01:00

mpegts.h

…

mpegtsenc.c

…

mpegvideodec.c

…

mpjpeg.c

…

msnwc_tcp.c

…

mtv.c

…

mux.c

…

mvi.c

mvi: check av_mallocz() result

2012-12-01 09:06:24 +00:00

mxf.c

…

mxf.h

…

mxfdec.c

mxfdec: fix double free

2012-12-09 11:46:26 +01:00

mxfenc.c

…

mxg.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

ncdec.c

…

network.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

network.h

…

nsvdec.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

nullenc.c

…

nut.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

nut.h

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

nutdec.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

nutenc.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

nuv.c

Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'

2012-11-29 14:16:46 +01:00

oggdec.c

oggdec: prevent codec from changing through ogg_replace_stream()

2012-12-05 04:40:19 +01:00

oggdec.h

…

oggenc.c

…

oggparsecelt.c

…

oggparsedirac.c

…

oggparseflac.c

…

oggparseogm.c

…

oggparseopus.c

…

oggparseskeleton.c

…

oggparsespeex.c

…

oggparsetheora.c

…

oggparsevorbis.c

…

oma.c

…

oma.h

…

omadec.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

omaenc.c

omaenc: remove superfluous "OMA: "

2012-11-24 10:04:20 +00:00

options_table.h

lavf: improve avoid_negative_ts help text

2012-12-08 13:30:43 +01:00

options.c

…

os_support.c

…

os_support.h

…

paf.c

paf: set channel layout

2012-11-13 13:25:19 +00:00

pcm.c

lavf/pcm: check size, do not produce invalid packets

2012-12-07 13:05:43 +00:00

pcm.h

pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers

2012-12-05 12:40:57 +00:00

pcmdec.c

pcmdec: move read_packet function to pcm.c so it can be shared with other demuxers

2012-12-05 12:40:57 +00:00

pcmenc.c

…

pmpdec.c

…

psxstr.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

pva.c

…

pvfdec.c

pvfdec: use ff_pcm_read_packet()

2012-12-05 12:40:57 +00:00

qcp.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

qtpalette.h

…

r3d.c

…

rawdec.c

raw demuxer: initialize end of partial packets

2012-12-05 00:02:43 +01:00

rawdec.h

…

rawenc.c

rawenc: cosmetics: reindent

2012-11-21 15:34:45 +00:00

rawenc.h

…

rawvideodec.c

rawvideodec: set bit rate

2012-12-04 15:52:58 +00:00

rdt.c

…

rdt.h

…

realtextdec.c

lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.

2012-12-02 00:06:03 +01:00

riff.c

add forgotten AV_ prefix to some CODEC_IDs

2012-12-09 01:47:58 +00:00

riff.h

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

rl2.c

…

rm.c

…

rm.h

…

rmdec.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

rmenc.c

…

rmsipr.c

…

rmsipr.h

…

rpl.c

rpl: return AVERROR_EOF instead of -1

2012-11-21 09:48:46 +00:00

rso.c

…

rso.h

…

rsodec.c

rsodec: use ff_pcm_read_packet()

2012-12-05 12:40:57 +00:00

rsoenc.c

…

rtmp.h

…

rtmpcrypt.c

…

rtmpcrypt.h

…

rtmpdh.c

…

rtmpdh.h

…

rtmphttp.c

…

rtmppkt.c

…

rtmppkt.h

…

rtmpproto.c

…

rtp.c

Merge remote-tracking branch 'qatar/master'

2012-11-15 11:31:13 +01:00

rtp.h

Merge remote-tracking branch 'qatar/master'

2012-11-15 11:31:13 +01:00

rtpdec_amr.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

rtpdec_asf.c

…

rtpdec_formats.h

…

rtpdec_g726.c

…

rtpdec_h263_rfc2190.c

…

rtpdec_h263.c

…

rtpdec_h264.c

…

rtpdec_ilbc.c

…

rtpdec_jpeg.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 commit '5d471b73d20616f5ac701ff62e5de49465cda264'

2012-12-10 01:27:10 +01:00

rtpdec.h

…

rtpenc_aac.c

…

rtpenc_amr.c

…

rtpenc_chain.c

Merge commit 'e4d349b4014ee2a03f521027e0bd1ace4a9e60bd'

2012-11-29 14:16:46 +01:00

rtpenc_chain.h

Merge remote-tracking branch 'qatar/master'

2012-11-15 11:31:13 +01:00

rtpenc_h263_rfc2190.c

…

rtpenc_h263.c

…

rtpenc_h264.c

…

rtpenc_jpeg.c

…

rtpenc_latm.c

…

rtpenc_mpv.c

…

rtpenc_vp8.c

…

rtpenc_xiph.c

…

rtpenc.c

Merge remote-tracking branch 'qatar/master'

2012-11-15 11:31:13 +01:00

rtpenc.h

…

rtpproto.c

…

rtsp.c

Merge remote-tracking branch 'qatar/master'

2012-11-15 11:31:13 +01:00

rtsp.h

…

rtspcodes.h

…

rtspdec.c

…

rtspenc.c

…

samidec.c

lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.

2012-12-02 00:06:03 +01:00

sapdec.c

…

sapenc.c

Merge remote-tracking branch 'qatar/master'

2012-11-15 11:31:13 +01:00

sauce.c

…

sauce.h

…

sbgdec.c

lavf/sbgdec: use proper constants for av_log().

2012-11-24 23:56:52 +01:00

sctp.c

…

sdp.c

Merge remote-tracking branch 'qatar/master'

2012-11-15 11:31:13 +01:00

seek-test.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

seek.c

…

seek.h

…

segafilm.c

segafilm: signal EOF

2012-11-21 23:51:21 +01:00

segment.c

lavf/segment: remove silly assert(), improve feedback

2012-12-09 20:42:35 +01:00

sierravmd.c

sierravmd: signal EOF

2012-11-21 10:38:52 +00:00

siff.c

siff: return meaningful error codes

2012-12-06 18:00:37 +00:00

smacker.c

smacker: use meaningful error codes

2012-12-06 18:06:52 +00:00

smjpeg.c

…

smjpeg.h

…

smjpegdec.c

…

smjpegenc.c

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

smoothstreamingenc.c

…

smush.c

smush: check audio packet size

2012-11-17 19:58:54 +00:00

sol.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

sox.h

…

soxdec.c

soxdec: use ff_pcm_read_packet()

2012-12-05 12:40:57 +00:00

soxenc.c

…

spdif.c

…

spdif.h

…

spdifdec.c

…

spdifenc.c

…

srtdec.c

lavf/srtdec: trim line break event separators from packet.

2012-11-20 22:38:39 +01:00

srtenc.c

…

subtitles.c

lavf/subtitles: seek a little more backward when necessary.

2012-12-02 00:06:03 +01:00

subtitles.h

lavf/subtitles: add ff_subtitles_queue_seek().

2012-12-02 00:06:03 +01:00

subviewerdec.c

lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.

2012-12-02 00:06:03 +01:00

swf.c

…

swf.h

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

swfdec.c

Add debug output when skipping unknown swf tags.

2012-12-04 15:52:37 +01:00

swfenc.c

…

takdec.c

tak: reduce difference with qatar

2012-12-09 22:01:00 +00:00

tcp.c

…

tedcaptionsdec.c

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

thp.c

thp: signal EOF

2012-11-21 10:21:54 +00:00

tiertexseq.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

tls.c

…

tmv.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

tta.c

…

tty.c

…

txd.c

…

udp.c

…

url-test.c

Merge commit 'cb45553f577f8e0ebfe05d3287e1b6fa5859b967'

2012-12-05 13:34:45 +01:00

url.h

…

urldecode.c

…

urldecode.h

…

utils.c

http/utils: rename "demuxer" to mime_type

2012-12-10 01:00:16 +01:00

vc1test.c

…

vc1testenc.c

…

version.h

lavf: TED Talks JSON captions demuxer.

2012-12-09 18:50:38 +01:00

vivo.c

add forgotten AV_ prefix to some CODEC_IDs

2012-12-09 01:47:58 +00:00

voc.c

…

voc.h

Merge commit 'bfe5454cd238b16e7977085f880205229103eccb'

2012-11-29 13:45:57 +01:00

vocdec.c

…

vocenc.c

…

vorbiscomment.c

…

vorbiscomment.h

…

vqf.c

…

wavdec.c

riff: ignore ff_read_riff_info() failure.

2012-11-23 23:41:57 +01:00

wavenc.c

wavenc: write fact chunk sample count at the correct file position

2012-11-26 19:11:10 -05:00

wc3movie.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

webvttdec.c

lavf: use ff_subtitles_queue_seek() for text subtitles demuxers.

2012-12-02 00:06:03 +01:00

westwood_aud.c

Merge remote-tracking branch 'qatar/master'

2012-11-13 11:09:38 +01:00

westwood_vqa.c

…

wtv.c

wtv: set channel layout for mpeg audio

2012-11-12 10:33:23 -05:00

wtv.h

…

wtvdec.c

wtvdec: fix null pointer dereference

2012-12-02 22:36:15 +01:00

wtvenc.c

lavf/wtvenc: fix s[tp]_pairs memleak.

2012-11-13 20:02:43 +01:00

wv.c

wv: use right function to read block_samples

2012-11-12 15:50:04 +00:00

wvenc.c

wvenc: multichannel muxing

2012-11-24 10:20:46 +00:00

xa.c

…

xmv.c

xmv: signal EOF

2012-11-22 20:37:24 +00:00

xwma.c

xwma: check bytes_per_sample, fix division by 0.

2012-11-15 00:56:54 +01:00

yop.c

yop: fix typo

2012-11-25 11:10:52 -05:00

yuv4mpeg.c

…