Michael Niedermayer 6262763d8d Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352' ...

* commit 'b6a4701612514c97d22f7ffb37993539f7718352':
  mpegts: Support HEVC demuxing

Conflicts:
	Changelog
	libavformat/version.h

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

2013-11-01 18:05:25 +01:00

..

4xm.c

…

a64.c

…

aacdec.c

…

ac3dec.c

…

act.c

…

adp.c

…

adtsenc.c

lavf/adtsenc: Add support for APE tags

2013-10-23 16:13:23 +02:00

adxdec.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

aea.c

…

afc.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

aiff.h

Fix decoding of G.726 in AIFF.

2013-10-18 19:53:47 +02:00

aiffdec.c

Fix decoding of G.726 in AIFF.

2013-10-18 19:53:47 +02:00

aiffenc.c

…

allformats.c

Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

2013-11-01 10:46:39 +01:00

amr.c

Remove an incorrect and unneeded assert in the amr demuxer.

2013-09-29 07:11:56 +02:00

anm.c

…

apc.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

ape.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

apetag.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

apetag.h

…

aqtitledec.c

…

asf.c

…

asf.h

…

asfcrypt.c

…

asfcrypt.h

…

asfdec.c

Merge commit 'cc41167aede4c101ad17eeffa8f39bb6c23d3dad'

2013-10-02 14:53:00 +02:00

asfenc.c

…

assdec.c

…

assenc.c

…

ast.c

…

ast.h

…

astdec.c

…

astenc.c

…

au.c

avformat/au: add assert to help source code analyzers

2013-10-20 14:46:36 +02:00

audiointerleave.c

…

audiointerleave.h

…

avc.c

…

avc.h

…

avformat.h

Merge commit '8b64c2ba0382892cad9e1a5ba601696d4cbb4d04'

2013-10-29 20:47:23 +01:00

avi.h

…

avidec.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

avienc.c

Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'

2013-09-27 12:13:41 +02:00

avio_internal.h

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

avio.c

Merge remote-tracking branch 'qatar/master'

2013-10-30 17:48:47 +01:00

avio.h

Do not leave positive values undefined when negative are defined as error

2013-10-19 16:42:57 +02:00

aviobuf.c

Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'

2013-09-27 12:13:41 +02:00

avisynth.c

avformat/avisynth: re-add trailing \n.

2013-10-29 19:42:08 +01:00

avlanguage.c

…

avlanguage.h

…

avr.c

avformat/avr: use ff_get_pcm_codec_id()

2013-10-12 20:21:38 +00:00

avs.c

…

bethsoftvid.c

…

bfi.c

Merge commit '640a2427aafa774b83316b7a8c5c2bdc28bfd269'

2013-09-30 00:13:36 +02:00

bink.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

bintext.c

avformat/bintext: protect against potential overflow of chars_per_frame

2013-10-21 23:37:49 +02:00

bit.c

…

bluray.c

…

bmv.c

bmv: Remove unused variable

2013-10-06 19:36:53 +02:00

boadec.c

…

brstm.c

…

c93.c

…

cache.c

…

caf.c

…

caf.h

…

cafdec.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

cafenc.c

…

cavsvideodec.c

…

cdg.c

…

cdxl.c

…

concat.c

Merge commit '06ebc0bf9a6401733a4ce1310325de19f631819a'

2013-09-27 11:45:37 +02:00

concatdec.c

…

crcenc.c

…

crypto.c

…

cutils.c

…

data_uri.c

…

daud.c

…

dfa.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

diracdec.c

…

dnxhddec.c

…

dsicin.c

…

dtsdec.c

…

dtshddec.c

…

dv.c

…

dv.h

…

dvenc.c

…

dxa.c

…

eacdata.c

…

electronicarts.c

Merge commit 'a9221e39600a31ee13e736e9e47743cde23f0280'

2013-09-29 23:52:07 +02:00

epafdec.c

…

ffm.h

…

ffmdec.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

ffmenc.c

…

ffmeta.h

…

ffmetadec.c

…

ffmetaenc.c

…

file_open.c

…

file.c

…

filmstripdec.c

…

filmstripenc.c

…

flac_picture.c

Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'

2013-10-13 09:37:21 +02:00

flac_picture.h

Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'

2013-10-13 09:37:21 +02:00

flacdec.c

Merge commit '601d6228c4811d8971a2412a759e1a4ab775ebe8'

2013-10-13 09:37:21 +02:00

flacenc_header.c

…

flacenc.c

…

flacenc.h

…

flic.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

flv.h

…

flvdec.c

avformat/flvdec: use avpriv_request_sample()

2013-10-18 09:55:16 +00:00

flvenc.c

Merge commit 'e6ed8668597cfea25dfb350a9b4df7fb2efc1d90'

2013-10-10 12:06:17 +02:00

format.c

…

framecrcenc.c

…

framehash.c

avformat/framehash: add software version to framecrc/md5

2013-10-23 16:32:32 +02:00

frmdec.c

…

ftp.c

avformat/ftp: add log regarding passive mode failure

2013-10-12 13:52:33 +02:00

g722.c

…

g723_1.c

…

g729dec.c

…

gif.c

…

gifdec.c

avformat/gifdec: make GIF_APP_EXT_LABEL parsing more robust

2013-10-04 23:26:40 +02:00

gopher.c

…

gsmdec.c

…

gxf.c

avformat/gxf: fix old codec id

2013-10-28 23:54:42 +01:00

gxf.h

…

gxfenc.c

…

h261dec.c

…

h263dec.c

…

h264dec.c

…

hevcdec.c

Merge commit '5846646296e377e093441dfe9eadde38ff1f7c99'

2013-11-01 17:33:05 +01:00

hls.c

…

hlsenc.c

…

hlsproto.c

…

hnm.c

Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

2013-11-01 10:46:39 +01:00

http.c

avformat/http: fix cookies

2013-10-31 01:42:13 +01:00

http.h

…

httpauth.c

…

httpauth.h

…

icodec.c

…

icoenc.c

…

id3v1.c

…

id3v1.h

…

id3v2.c

…

id3v2.h

…

id3v2enc.c

…

idcin.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

idroqdec.c

…

idroqenc.c

…

iff.c

…

ilbc.c

…

img2.c

…

img2dec.c

…

img2enc.c

…

ingenientdec.c

…

internal.h

avformat: add ff_alloc_extradata() helper

2013-10-13 20:13:38 +00:00

ipmovie.c

…

ircam.c

…

ircam.h

…

ircamdec.c

…

ircamenc.c

…

isom.c

mov: Support HEVC demuxing

2013-10-31 20:20:32 +01:00

isom.h

…

iss.c

…

iv8.c

…

ivfdec.c

…

ivfenc.c

…

jacosubdec.c

…

jacosubenc.c

…

jvdec.c

…

latmenc.c

…

libavformat.v

…

libgme.c

…

libmodplug.c

…

libnut.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

libquvi.c

…

librtmp.c

…

libssh.c

…

lmlm4.c

…

loasdec.c

…

log2_tab.c

…

lvfdec.c

…

lxfdec.c

Merge remote-tracking branch 'qatar/master'

2013-09-27 13:27:31 +02:00

m4vdec.c

…

Makefile

Merge commit '9af7a8523a6bb517834ebed36093bdab11a8b38e'

2013-11-01 10:46:39 +01:00

matroska.c

matroskadec: Support HEVC demuxing

2013-10-31 20:20:49 +01:00

matroska.h

…

matroskadec.c

Merge commit '959bea13ce3498a5bddf8a415a061a7bb5a8b075'

2013-11-01 17:57:57 +01:00

matroskaenc.c

matroskaenc: fixed display width / height calculation for stereo mode

2013-10-29 16:08:00 +01:00

md5enc.c

avformat/md5enc: add format, version and column headers

2013-10-26 12:16:04 +02:00

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

Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'

2013-09-27 12:13:41 +02:00

mov_chan.c

…

mov_chan.h

…

mov.c

mov: Support HEVC demuxing

2013-10-31 20:20:32 +01:00

movenc.c

Merge commit 'e01fba5562133ac56a4f44c6f214a80ee33cb388'

2013-10-23 12:05:48 +02:00

movenc.h

movenc: Add an F4V muxer

2013-10-23 11:17:03 +03:00

movenchint.c

…

mp3dec.c

avformat/mp3dec: perform seek resync in the correct direction

2013-10-25 19:37:03 +02:00

mp3enc.c

…

mpc8.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

mpc.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

mpeg.c

avformat/vobsub: fix invalid sub queue access while seeking.

2013-10-20 21:23:46 +02:00

mpeg.h

…

mpegenc.c

avformat/mpegenc: check, warn and clip muxrate to syntactical possible values

2013-09-29 17:02:57 +02:00

mpegts.c

mpegts: Support HEVC demuxing

2013-10-31 20:20:57 +01:00

mpegts.h

…

mpegtsenc.c

…

mpegvideodec.c

…

mpjpeg.c

…

mpl2dec.c

…

mpsubdec.c

…

msnwc_tcp.c

…

mtv.c

Avoid img_segment_size == 0 in mtv demuxer.

2013-09-30 07:55:23 +02:00

mux.c

…

mvdec.c

…

mvi.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

mxf.c

…

mxf.h

…

mxfdec.c

avformat/mxfdec; parse random index pack to get last partition offset and use it when footer partition offset is missing

2013-10-21 13:29:30 +00:00

mxfenc.c

avformat/mxfenc: instance number is just 24 bits

2013-09-29 14:33:40 +02:00

mxg.c

…

ncdec.c

…

network.c

avformat/network: check for fcntl() failure in ff_socket()

2013-10-20 16:34:32 +02:00

network.h

…

nistspheredec.c

…

noproxy-test.c

…

nsvdec.c

…

nullenc.c

…

nut.c

nut: Fix unchecked allocations

2013-10-22 17:09:56 +01:00

nut.h

nut: Fix unchecked allocations

2013-10-22 17:09:56 +01:00

nutdec.c

nut: Fix unchecked allocations

2013-10-22 17:09:56 +01:00

nutenc.c

nut: Fix unchecked allocations

2013-10-22 17:09:56 +01:00

nuv.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

oggdec.c

avformat/oggdec: favor av_freep() over av_free()

2013-10-19 22:50:16 +02:00

oggdec.h

oggdec: add support for Opus in Ogg demuxing

2013-10-12 15:25:18 +02:00

oggenc.c

…

oggparsecelt.c

avformat/oggparsecelt/celt_header: fix memleak

2013-10-20 16:48:51 +02:00

oggparsedirac.c

…

oggparseflac.c

avformat/oggparseflac: check ff_alloc_extradata() return code

2013-10-20 16:55:43 +02:00

oggparseogm.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

oggparseopus.c

oggparseopus: use ff_alloc_extradata()

2013-10-14 12:59:59 +02:00

oggparseskeleton.c

…

oggparsespeex.c

avformat/oggparsespeex: Check for extradata allocation failure

2013-10-20 16:57:45 +02:00

oggparsetheora.c

Merge commit 'ce6949d3a0607eb318dc2872553110df934e9720'

2013-11-01 13:15:21 +01:00

oggparsevorbis.c

Merge commit 'fd2384f02b905a106fba9222ece4ddbe2ec61937'

2013-10-13 10:06:42 +02:00

oma.c

Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'

2013-09-30 02:15:36 +02:00

oma.h

Merge commit '23d0fdcf6f30843fc3f14084d80581f1ca10f1f3'

2013-09-30 02:15:36 +02:00

omadec.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

omaenc.c

…

options_table.h

correct the AVOption documentation for AV_EF_CAREFUL

2013-10-27 20:03:08 +01:00

options.c

…

os_support.c

…

os_support.h

…

paf.c

…

pcm.c

…

pcm.h

…

pcmdec.c

…

pcmenc.c

…

pjsdec.c

…

pmpdec.c

…

psxstr.c

…

pva.c

…

pvfdec.c

…

qcp.c

…

qtpalette.h

…

r3d.c

…

rawdec.c

…

rawdec.h

…

rawenc.c

…

rawenc.h

…

rawvideodec.c

…

rdt.c

Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'

2013-10-29 11:06:32 +01:00

rdt.h

Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'

2013-10-29 11:06:32 +01:00

realtextdec.c

…

redspark.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

riff.c

Support H.264 fourcc UMSV.

2013-10-14 16:29:58 +02:00

riff.h

…

riffdec.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

riffenc.c

…

rl2.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

rm.c

…

rm.h

…

rmdec.c

avformat/rmdec: english typos

2013-10-25 19:14:36 +02:00

rmenc.c

…

rmsipr.c

…

rmsipr.h

…

rpl.c

avformat/rpl: use avpriv_report_missing_feature/avpriv_request_sample

2013-10-14 18:18:25 +00:00

rsd.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

rso.c

…

rso.h

…

rsodec.c

…

rsoenc.c

…

rtmp.h

…

rtmpcrypt.c

…

rtmpcrypt.h

…

rtmpdh.c

…

rtmpdh.h

…

rtmphttp.c

Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'

2013-09-27 12:13:41 +02:00

rtmppkt.c

Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'

2013-10-14 15:31:11 +02:00

rtmppkt.h

Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'

2013-10-14 15:31:11 +02:00

rtmpproto.c

Merge commit '84a125c4c28f3e3e215d2e6c32f7f0ec43bbc04c'

2013-10-14 15:31:11 +02:00

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

…

rtpdec_ilbc.c

…

rtpdec_jpeg.c

…

rtpdec_latm.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

rtpdec_mpeg4.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

rtpdec_mpeg12.c

…

rtpdec_mpegts.c

…

rtpdec_qcelp.c

…

rtpdec_qdm2.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

rtpdec_qt.c

Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'

2013-09-27 12:13:41 +02:00

rtpdec_svq3.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

rtpdec_vp8.c

…

rtpdec_xiph.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

rtpdec.c

Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'

2013-10-29 11:06:32 +01:00

rtpdec.h

Merge commit 'feeafb4adabd5c17de1738ed9962e40892b20edb'

2013-10-29 11:06:32 +01:00

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

…

rtpenc.h

…

rtpproto.c

avformat/rtpproto: when local rtp port and local rtcp port are not specified, try to make two successive ports and retry 3 times when failed

2013-10-25 22:40:21 +02:00

rtpproto.h

…

rtsp.c

…

rtsp.h

…

rtspcodes.h

…

rtspdec.c

…

rtspenc.c

…

samidec.c

…

sapdec.c

…

sapenc.c

…

sauce.c

…

sauce.h

…

sbgdec.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

sctp.c

…

sdp.c

…

seek-test.c

…

seek.c

lavf: remove unreliable timestamp guessing heuristic

2013-10-29 20:10:41 +01:00

seek.h

lavf: remove unreliable timestamp guessing heuristic

2013-10-29 20:10:41 +01:00

segafilm.c

…

segment.c

lavf/segment: simplify logic and fix !=0 check on segment_end return value

2013-10-15 15:17:22 +02:00

sierravmd.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

siff.c

…

smacker.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

smjpeg.c

…

smjpeg.h

…

smjpegdec.c

…

smjpegenc.c

…

smoothstreamingenc.c

Merge commit 'd872fb0f7ff2ff0ba87f5ccf6a1a55ca2be472c9'

2013-09-27 12:13:41 +02:00

smush.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

sol.c

…

sox.h

…

soxdec.c

…

soxenc.c

…

spdif.c

…

spdif.h

…

spdifdec.c

lavf/spdifdec: fix demuxing of AAC in IEC 61937

2013-10-29 22:45:27 +01:00

spdifenc.c

…

srtdec.c

…

srtenc.c

…

srtp.c

…

srtp.h

…

srtpproto.c

…

subtitles.c

avformat/vobsub: fix several issues.

2013-10-04 07:59:49 +02:00

subtitles.h

avformat/vobsub: fix several issues.

2013-10-04 07:59:49 +02:00

subviewer1dec.c

…

subviewerdec.c

…

swf.c

…

swf.h

…

swfdec.c

…

swfenc.c

…

takdec.c

…

tcp.c

…

tedcaptionsdec.c

…

tee.c

lavf/tee: fix leak of bsfs array.

2013-10-21 17:32:01 +02:00

thp.c

avformat/thp: force moving forward

2013-10-31 02:26:07 +01:00

tiertexseq.c

…

tls.c

avformat/tls: fix {} error for the GNUTLS case

2013-09-27 15:59:19 +02:00

tmv.c

…

tta.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

tty.c

…

txd.c

…

udp.c

…

unix.c

…

url-test.c

…

url.c

…

url.h

Merge remote-tracking branch 'qatar/master'

2013-10-30 17:48:47 +01:00

urldecode.c

…

urldecode.h

…

utils.c

lavf: remove unreliable timestamp guessing heuristic

2013-10-29 20:10:41 +01:00

vc1test.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

vc1testenc.c

…

version.h

Merge commit 'b6a4701612514c97d22f7ffb37993539f7718352'

2013-11-01 18:05:25 +01:00

vivo.c

…

voc.c

…

voc.h

…

vocdec.c

avformat/vocdec: return AVERROR_EOF when EOF is reached

2013-10-13 09:50:38 +00:00

vocenc.c

…

vorbiscomment.c

…

vorbiscomment.h

…

vplayerdec.c

…

vqf.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

w64.c

…

w64.h

…

wavdec.c

avformat/wavdec: Fix smv packet interleaving

2013-10-25 12:50:26 +02:00

wavenc.c

…

wc3movie.c

…

webvttdec.c

…

webvttenc.c

…

westwood_aud.c

…

westwood_vqa.c

avformat/westwood_vqa: s/unsigned char/uint8_t & s/unsigned int/uint32_t

2013-10-13 20:21:03 +00:00

wtv_common.c

avformat/wtv: rename to wtv_common

2013-10-19 10:58:17 +02:00

wtv.h

Merge remote-tracking branch 'qatar/master'

2013-10-19 11:11:34 +02:00

wtvdec.c

avformat/wtvdec: drop SHIFT_SECTOR_BITS() macro

2013-10-19 11:24:20 +02:00

wtvenc.c

…

wv.c

…

wv.h

…

wvdec.c

…

wvenc.c

…

xa.c

…

xmv.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

xwma.c

Merge commit 'adc09136a4a63b152630abeacb22c56541eacf60'

2013-09-29 22:59:49 +02:00

yop.c

avformat: use ff_alloc_extradata()

2013-10-13 20:13:38 +00:00

yuv4mpeg.c

…