Michael Niedermayer 419787a2ff Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  flv: Workaround for buggy Omnia A/XE encoder

Conflicts:
	libavformat/flvdec.c

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

2014-01-11 20:56:29 +01:00

..

4xm.c

avformat/4xm: shrink packet if it was only partially initialized

2013-12-22 01:48:33 +01:00

a64.c

…

aacdec.c

…

ac3dec.c

…

act.c

…

adp.c

Do not detect "00000000..." (and other non-changing values) as adp.

2013-12-09 13:51:00 +01:00

adtsenc.c

…

adxdec.c

avformat/adxdec: use ff_get_extradata()

2013-12-25 17:14:32 +01:00

aea.c

…

afc.c

…

aiff.h

…

aiffdec.c

avformat/aiffdec: use ff_get_extradata()

2013-12-25 17:14:32 +01:00

aiffenc.c

…

allformats.c

…

amr.c

…

anm.c

…

apc.c

avformat/apc: use ff_get_extradata()

2013-12-25 17:14:32 +01:00

ape.c

avformat/ape: free packet on avio_read() failure

2013-12-25 02:32:40 +01:00

apetag.c

avformat/apetag: use ff_get_extradata()

2013-12-25 17:22:49 +01:00

apetag.h

…

aqtitledec.c

…

asf.c

…

asf.h

avformat/asf: clear uninitialized areas of packets before returning them

2013-12-13 23:32:45 +01:00

asfcrypt.c

…

asfcrypt.h

…

asfdec.c

avformat/asf: clear uninitialized areas of packets before returning them

2013-12-13 23:32:45 +01:00

asfenc.c

riffenc: add option to ff_put_bmp_header to ignore extradata

2013-12-23 15:42:35 +01:00

assdec.c

…

assenc.c

…

ast.c

…

ast.h

…

astdec.c

…

astenc.c

…

au.c

…

audiointerleave.c

…

audiointerleave.h

…

avc.c

…

avc.h

…

avformat.h

avformat: dont run update_initial_duration() twice

2013-12-31 14:13:51 +01:00

avformatres.rc

…

avi.h

…

avidec.c

Use the h264 parser when decoding VSSH in avi.

2014-01-07 22:49:05 +01:00

avienc.c

riffenc: add option to ff_put_bmp_header to ignore extradata

2013-12-23 15:42:35 +01:00

avio_internal.h

…

avio.c

…

avio.h

…

aviobuf.c

avformat/aviobuf: fix null dereference in avio_close_dyn_buf()

2013-12-11 16:16:04 +01:00

avisynth.c

avformat/avisynth simplify packet allocation

2014-01-10 15:38:59 +01:00

avlanguage.c

…

avlanguage.h

…

avr.c

…

avs.c

…

bethsoftvid.c

…

bfi.c

…

bink.c

avformat/bink: display audio track ids

2014-01-03 14:11:07 +01:00

bintext.c

…

bit.c

…

bluray.c

…

bmv.c

…

boadec.c

…

brstm.c

…

c93.c

…

cache.c

…

caf.c

…

caf.h

…

cafdec.c

avformat/cafdec: use ff_get_extradata()

2013-12-25 17:23:39 +01:00

cafenc.c

Force one stream in caf muxer.

2013-12-13 11:57:39 +01:00

cavsvideodec.c

…

cdg.c

…

cdxl.c

…

concat.c

…

concatdec.c

lavf/concatdec: fix crash in case a file in script cannot be opened

2013-12-18 15:14:58 +01:00

crcenc.c

…

crypto.c

…

cutils.c

…

data_uri.c

…

daud.c

…

dfa.c

…

diracdec.c

…

dnxhddec.c

…

dsicin.c

…

dtsdec.c

…

dtshddec.c

…

dv.c

…

dv.h

…

dvenc.c

…

dxa.c

avformat/dxa: check avio_read() return

2013-12-19 18:36:49 +01:00

eacdata.c

…

electronicarts.c

avformat/electronicarts: detect endianness by comparing sizes instead of using an arbitrary threshold

2013-12-21 14:09:45 +01:00

epafdec.c

…

ffm.h

…

ffmdec.c

avformat/ffmdec: use ff_get_extradata()

2013-12-25 17:23:55 +01:00

ffmenc.c

…

ffmeta.h

…

ffmetadec.c

…

ffmetaenc.c

…

file_open.c

…

file.c

lavf/file: fix help message first character casing for trunc option

2014-01-05 00:51:38 +01:00

filmstripdec.c

…

filmstripenc.c

…

flac_picture.c

…

flac_picture.h

…

flacdec.c

…

flacenc_header.c

…

flacenc.c

Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'

2014-01-10 02:32:12 +01:00

flacenc.h

…

flic.c

…

flv.h

…

flvdec.c

Merge remote-tracking branch 'qatar/master'

2014-01-11 20:56:29 +01:00

flvenc.c

Merge commit 'f412b2c9f3a7add0ab8021262ec4bad249347e30'

2013-12-21 00:14:11 +01:00

format.c

avformat/format: av_register_output_format() and av_register_intput_format() that work in O(1) time

2013-12-17 01:07:43 +01:00

framecrcenc.c

…

framehash.c

…

frmdec.c

…

ftp.c

…

g722.c

…

g723_1.c

…

g729dec.c

…

gif.c

…

gifdec.c

…

gopher.c

…

gsmdec.c

…

gxf.c

…

gxf.h

…

gxfenc.c

avformat/gxfenc: dont use a int intermediate to store in a unsigned int table

2013-12-21 13:52:10 +01:00

h261dec.c

…

h263dec.c

…

h264dec.c

…

hdsenc.c

Merge commit '797f2a791397210ec1b591b326658805c5dbf104'

2013-12-14 22:17:17 +01:00

hevcdec.c

…

hls.c

avformat/hls: decouple playlists from variants

2014-01-03 15:05:48 +02:00

hlsenc.c

avformat/hlsenc: copy metadata

2013-12-12 18:41:39 +01:00

hlsproto.c

…

hnm.c

…

http.c

avformat/http: always allow no-op seek

2014-01-03 15:05:48 +02:00

http.h

…

httpauth.c

…

httpauth.h

…

icodec.c

…

icoenc.c

…

id3v1.c

…

id3v1.h

…

id3v2.c

avformat/id3v2: allow ID3 parsing without AVFormatContext

2013-12-31 05:15:19 +02:00

id3v2.h

avformat/id3v2: allow ID3 parsing without AVFormatContext

2013-12-31 05:15:19 +02:00

id3v2enc.c

…

idcin.c

avformat/idcin: use ff_get_extradata()

2013-12-25 17:38:29 +01:00

idroqdec.c

…

idroqenc.c

…

iff.c

avformat/iff: check avio_read() return in get_metadata()

2013-12-29 00:58:13 +01:00

ilbc.c

…

img2.c

Merge commit 'ae9d13f03e6c81ea00fafe6aa74b4a849ec8da1a'

2013-12-12 19:48:36 +01:00

img2dec.c

…

img2enc.c

Merge commit 'be7c323176e2e5fcf30e3d2ff20975b2f936811b'

2013-12-22 11:53:41 +01:00

ingenientdec.c

…

internal.h

avformat: add ff_get_extradata()

2013-12-25 17:14:32 +01:00

ipmovie.c

avformat/ipmovie: Check palette size in OPCODE_SET_PALETTE

2013-12-18 23:46:37 +01:00

ircam.c

…

ircam.h

…

ircamdec.c

…

ircamenc.c

…

isom.c

avformat/isom: use ff_get_extradata()

2013-12-25 17:38:29 +01:00

isom.h

…

iss.c

avformat/iss: check sscanf() return code

2013-12-23 16:28:44 +01:00

iv8.c

…

ivfdec.c

…

ivfenc.c

…

jacosubdec.c

…

jacosubenc.c

…

jvdec.c

Merge commit '15739a9bd19a7d47ad8afb25348c684a3bdd6ef2'

2013-12-21 00:06:13 +01:00

latmenc.c

…

libavformat.v

…

libgme.c

…

libmodplug.c

…

libnut.c

…

libquvi.c

…

librtmp.c

…

libssh.c

lavf/libssh: improve authentication

2013-12-29 16:24:07 +01:00

lmlm4.c

…

loasdec.c

…

log2_tab.c

…

lvfdec.c

…

lxfdec.c

…

m4vdec.c

…

Makefile

oggdec: add support for VP8 demuxing

2013-12-30 04:05:27 +01:00

matroska.c

…

matroska.h

…

matroskadec.c

avformat/matroskadec: check generic audio deinterleaver sub_packet_size against frame_size

2014-01-10 23:45:43 +01:00

matroskaenc.c

avformat/matroskaenc: warn when muxing video codec not supported by format

2014-01-05 04:33:24 +01:00

md5enc.c

…

md5proto.c

…

metadata.c

…

metadata.h

…

mgsts.c

…

microdvddec.c

…

microdvdenc.c

…

mkvtimestamp_v2.c

…

mm.c

…

mmf.c

…

mms.c

Merge remote-tracking branch 'qatar/master'

2013-12-26 13:24:43 +01:00

mms.h

…

mmsh.c

…

mmst.c

Merge remote-tracking branch 'qatar/master'

2013-12-26 13:24:43 +01:00

mov_chan.c

…

mov_chan.h

…

mov.c

avformat/mov: clear padding area in mov_read_extradata()

2013-12-28 03:42:40 +01:00

movenc.c

lavf/movenc: return meaningful error code from mov_write_header()

2013-12-14 13:21:58 +01:00

movenc.h

…

movenchint.c

…

mp3dec.c

avformat/mp3dec: fix start time in light of initial skip samples

2014-01-05 01:05:16 +01:00

mp3enc.c

…

mpc8.c

avformat/mpc8: check avio_read() return in mpc8_parse_seektable()

2013-12-26 00:11:49 +01:00

mpc.c

avformat/mpc: use ff_get_extradata()

2013-12-25 17:38:29 +01:00

mpeg.c

…

mpeg.h

…

mpegenc.c

…

mpegts.c

avformat/mpegts: demux timed ID3 metadata

2013-12-31 03:13:12 +02:00

mpegts.h

…

mpegtsenc.c

…

mpegvideodec.c

…

mpjpeg.c

…

mpl2dec.c

…

mpsubdec.c

…

msnwc_tcp.c

…

mtv.c

…

mux.c

avformat/mux: fix "no tag found" check in validate_codec_tag()

2014-01-01 22:30:31 +01:00

mvdec.c

…

mvi.c

…

mxf.c

…

mxf.h

…

mxfdec.c

avformat/mxfdec: check avio_read(UID) result

2014-01-10 02:12:30 +01:00

mxfenc.c

…

mxg.c

…

ncdec.c

…

network.c

avformat/network: check ff_socket_nonblock() return and print a debug message

2013-12-13 17:08:03 +01:00

network.h

Merge remote-tracking branch 'qatar/master'

2014-01-07 13:16:55 +01:00

nistspheredec.c

avformat/nistspheredec: initialize header_size to -1

2013-12-20 18:08:58 +01:00

noproxy-test.c

…

nsvdec.c

…

nullenc.c

…

nut.c

nut: Support XYZ12 rawvideo

2014-01-10 17:51:13 +01:00

nut.h

avformat/nut: add support for per frame side & meta data with version 4

2014-01-04 14:13:31 +01:00

nutdec.c

avformat/nutdec: fix packet end clearing

2014-01-10 00:34:15 +01:00

nutenc.c

avformat/nut: add support for per frame side & meta data with version 4

2014-01-04 14:13:31 +01:00

nuv.c

avformat/nuv: use ff_get_extradata()

2013-12-25 17:38:29 +01:00

oggdec.c

avformat/oggdec: dont read timestamps from EOS pages of ogm videos

2014-01-04 18:39:42 +01:00

oggdec.h

oggdec: add support for VP8 demuxing

2013-12-30 04:05:27 +01:00

oggenc.c

…

oggparsecelt.c

…

oggparsedirac.c

…

oggparseflac.c

…

oggparseogm.c

Merge commit '75647dea6f7db79b409bad66a119f5c73da730f3'

2014-01-06 15:28:24 +01:00

oggparseopus.c

avformat/oggparseopus: fix segmented timestamps

2014-01-04 22:39:07 +01:00

oggparseskeleton.c

…

oggparsespeex.c

…

oggparsetheora.c

avformat/oggparsetheora: zero extradata padding area

2013-12-15 19:21:48 +01:00

oggparsevorbis.c

…

oggparsevp8.c

oggdec: add support for VP8 demuxing

2013-12-30 04:05:27 +01:00

oma.c

…

oma.h

…

omadec.c

ATRAC3+ decoder

2014-01-09 19:33:07 +01:00

omaenc.c

…

options_table.h

…

options.c

…

os_support.c

…

os_support.h

…

paf.c

…

pcm.c

…

pcm.h

…

pcmdec.c

…

pcmenc.c

…

pjsdec.c

avformat/pjsdec: dont increase pointer when its already at the end in read_ts()

2014-01-11 02:28:17 +01:00

pmpdec.c

Merge commit '1b5d065ca722eb8028c7a08e054b6da3419faf5d'

2014-01-04 01:36:06 +01:00

psxstr.c

avformat/psxstr: zero packet to prevent uninitialized data to leak through to the decoder

2013-12-16 04:32:50 +01:00

pva.c

avformat/pva: Make sure the header is large enough before reading the timestamp from it

2013-12-20 23:04:51 +01:00

pvfdec.c

…

qcp.c

…

qtpalette.h

…

r3d.c

…

rawdec.c

…

rawdec.h

…

rawenc.c

Force one stream for raw muxers.

2013-12-11 13:15:49 +01:00

rawenc.h

…

rawvideodec.c

…

rdt.c

…

rdt.h

…

realtextdec.c

…

redspark.c

…

riff.c

…

riff.h

riffenc: add option to ff_put_bmp_header to ignore extradata

2013-12-23 15:42:35 +01:00

riffdec.c

avformat/riffdec: use ff_get_extradata()

2013-12-25 17:38:29 +01:00

riffenc.c

avformat/riffenc: indent

2013-12-23 15:55:47 +01:00

rl2.c

avformat/rl2: use ff_get_extradata()

2013-12-25 17:38:29 +01:00

rm.c

…

rm.h

…

rmdec.c

avformat/rmdec: when reading audio blocks, dont leave holes when reading fails

2014-01-09 23:50:59 +01:00

rmenc.c

…

rmsipr.c

…

rmsipr.h

…

rpl.c

rpl: Dont fill the index with entries that failed to be parsed

2013-12-19 19:24:10 +01:00

rsd.c

avformat/rsd: use ff_get_extradata()

2013-12-25 17:38:30 +01:00

rso.c

…

rso.h

…

rsodec.c

…

rsoenc.c

…

rtmp.h

…

rtmpcrypt.c

…

rtmpcrypt.h

…

rtmpdh.c

…

rtmpdh.h

…

rtmphttp.c

…

rtmppkt.c

…

rtmppkt.h

…

rtmpproto.c

…

rtp.c

…

rtp.h

…

rtpdec_amr.c

…

rtpdec_asf.c

…

rtpdec_formats.h

…

rtpdec_g726.c

…

rtpdec_h263_rfc2190.c

…

rtpdec_h263.c

…

rtpdec_h264.c

Merge remote-tracking branch 'qatar/master'

2013-12-14 22:39:57 +01:00

rtpdec_ilbc.c

…

rtpdec_jpeg.c

…

rtpdec_latm.c

…

rtpdec_mpeg4.c

…

rtpdec_mpeg12.c

…

rtpdec_mpegts.c

…

rtpdec_qcelp.c

…

rtpdec_qdm2.c

…

rtpdec_qt.c

…

rtpdec_svq3.c

…

rtpdec_vp8.c

…

rtpdec_xiph.c

…

rtpdec.c

…

rtpdec.h

…

rtpenc_aac.c

…

rtpenc_amr.c

…

rtpenc_chain.c

…

rtpenc_chain.h

…

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

avformat/rtpenc: check av_packet_get_side_data() return, fix null ptr dereference

2013-12-13 02:09:20 +01:00

rtpenc.h

…

rtpproto.c

…

rtpproto.h

…

rtsp.c

doc/protocols/rtsp, lavf/rtsp: fix/extend options documentation

2014-01-01 12:57:15 +01:00

rtsp.h

…

rtspcodes.h

…

rtspdec.c

Merge remote-tracking branch 'qatar/master'

2013-12-12 00:41:02 +01:00

rtspenc.c

…

samidec.c

…

sapdec.c

…

sapenc.c

…

sauce.c

…

sauce.h

…

sbgdec.c

…

sctp.c

…

sdp.c

Merge remote-tracking branch 'qatar/master'

2014-01-05 02:38:57 +01:00

seek-test.c

…

seek.c

…

seek.h

…

segafilm.c

avformat/segafilm: drop song and dance, this seems not to do anything anymore since a long time

2014-01-07 15:02:31 +01:00

segment.c

lavf/segment: increase logging level for message with segment start information

2013-12-18 15:14:58 +01:00

sierravmd.c

avformat/sierravmd: Check avio_read return value

2013-12-20 01:03:19 +01:00

siff.c

avformat/siff: check avio_read() return value before returning packet

2013-12-29 13:25:13 +01:00

smacker.c

…

smjpeg.c

…

smjpeg.h

…

smjpegdec.c

…

smjpegenc.c

…

smoothstreamingenc.c

…

smush.c

…

sol.c

…

sox.h

…

soxdec.c

…

soxenc.c

…

spdif.c

…

spdif.h

…

spdifdec.c

…

spdifenc.c

…

srtdec.c

…

srtenc.c

…

srtp.c

…

srtp.h

…

srtpproto.c

…

subtitles.c

…

subtitles.h

…

subviewer1dec.c

…

subviewerdec.c

…

swf.c

…

swf.h

…

swfdec.c

avformat/swfdec: clear 4 bytes at the end of a packet if they are not initialized

2013-12-19 05:07:22 +01:00

swfenc.c

…

takdec.c

avformat/takdec: zero padding area before use

2014-01-07 19:48:13 +01:00

tcp.c

doc/protocols/tcp,lavf/tcp: apply minor fixes to TCP protocol documentation

2013-12-25 18:42:26 +01:00

tedcaptionsdec.c

…

tee.c

…

thp.c

…

tiertexseq.c

…

tls.c

…

tmv.c

…

tta.c

…

tty.c

…

txd.c

…

udp.c

avformat/udp: debug log udp socket size

2014-01-08 23:56:05 +01:00

unix.c

…

url-test.c

…

url.c

…

url.h

…

urldecode.c

…

urldecode.h

…

utils.c

Merge commit '3867f3718ba82ff11d3e24c6d84beb520d0b174f'

2014-01-06 15:34:45 +01:00

vc1test.c

avformat/vc1test: use ff_get_extradata()

2013-12-25 17:38:30 +01:00

vc1testenc.c

…

version.h

Merge commit 'aa69cbc9e08281db6ecb98a2c8b4f60e8b12e558'

2014-01-10 02:32:12 +01:00

vivo.c

…

voc.c

…

voc.h

…

vocdec.c

…

vocenc.c

…

vorbiscomment.c

…

vorbiscomment.h

…

vplayerdec.c

…

vqf.c

avformat/vqf: check avio_read()s return value more completely

2014-01-01 16:53:54 +01:00

w64.c

…

w64.h

…

wavdec.c

…

wavenc.c

…

wc3movie.c

avformat/wc3movie: Check strings before printing.

2013-12-29 14:06:47 +01:00

webvttdec.c

avformat/webvttdec: Dont skip over a never checked byte after -->

2014-01-07 04:09:19 +01:00

webvttenc.c

…

westwood_aud.c

…

westwood_vqa.c

avformat/westwood_vqa: use ff_get_extradata()

2013-12-25 17:38:30 +01:00

wtv_common.c

wtv: make ff_format_videoinfo2 visible to wtv encoder

2013-12-23 19:43:09 +01:00

wtv.h

wtv: make ff_format_videoinfo2 visible to wtv encoder

2013-12-23 19:43:09 +01:00

wtvdec.c

wtv: make ff_format_videoinfo2 visible to wtv encoder

2013-12-23 19:43:09 +01:00

wtvenc.c

wtvenc: output ff_format_none if ff_put_wav_header fails

2013-12-23 19:51:32 +01:00

wv.c

…

wv.h

…

wvdec.c

…

wvenc.c

…

xa.c

…

xmv.c

…

xwma.c

…

yop.c

…

yuv4mpeg.c

…