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

* qatar/master:
  aac: K&R formatting cosmetics

Conflicts:
	libavformat/aacdec.c

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

2014-03-14 12:00:45 +01:00

..

4xm.c

…

a64.c

…

aacdec.c

Merge remote-tracking branch 'qatar/master'

2014-03-14 12:00:45 +01:00

ac3dec.c

avformat/ac3dec: Use avpriv_ac3_parse_header2()

2014-03-01 01:56:25 +01:00

act.c

…

adp.c

…

adtsenc.c

…

adxdec.c

…

aea.c

…

afc.c

…

aiff.h

…

aiffdec.c

…

aiffenc.c

lavf/id3v2enc: use metadata_header_padding

2014-01-24 22:50:06 +01:00

allformats.c

lavf: add subfile protocol.

2014-03-08 12:36:57 +01:00

amr.c

…

anm.c

…

apc.c

…

ape.c

…

apetag.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

apetag.h

…

aqtitledec.c

…

asf.c

…

asf.h

Move GUID-related objects to riffenc.c and riff.c.

2014-01-29 00:44:59 +01:00

asfcrypt.c

…

asfcrypt.h

…

asfdec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

asfenc.c

Move GUID-related objects to riffenc.c and riff.c.

2014-01-29 00:44:59 +01:00

assdec.c

Merge commit '5c9c305d14730faf2af206e5d519df4948de0ed2'

2014-03-02 21:44:44 +01:00

assenc.c

…

ast.c

…

ast.h

…

astdec.c

…

astenc.c

…

au.c

…

audiointerleave.c

…

audiointerleave.h

…

avc.c

…

avc.h

…

avformat.h

avformat: extracting NTP timestamp from RTCP

2014-03-12 13:33:14 +01:00

avformatres.rc

…

avi.h

…

avidec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

avienc.c

Merge commit '3407172b36a93cec410c6a287dbeec0f41257512'

2014-03-04 22:21:58 +01:00

avio_internal.h

…

avio.c

lavf/avio: fix ffurl_alloc error checks

2014-03-06 00:30:27 +01:00

avio.h

Merge commit '4d7ab5cfebef91820af2933ef2f622ea598e6b53'

2014-02-17 21:11:29 +01:00

aviobuf.c

avformat/aviobuf: optimize sequential backward seeking

2014-03-01 23:57:40 +01:00

avisynth.c

avisynth: fix setting packet properties

2014-01-17 11:11:08 +01:00

avlanguage.c

…

avlanguage.h

…

avr.c

…

avs.c

…

bethsoftvid.c

…

bfi.c

…

bink.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +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: revert %c changes from d92024f18fa3d69937cb2575f3a8bf973df02430

2014-03-12 05:09:28 +01:00

cafenc.c

…

cavsvideodec.c

…

cdg.c

…

cdxl.c

…

concat.c

…

concatdec.c

lavf/concatdec: reindent after last commit.

2014-03-08 12:44:45 +01:00

crcenc.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

crypto.c

…

cutils.c

…

data_uri.c

…

daud.c

…

dfa.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

diracdec.c

…

dnxhddec.c

…

dsicin.c

…

dtsdec.c

…

dtshddec.c

…

dv.c

…

dv.h

…

dvenc.c

…

dxa.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

eacdata.c

…

electronicarts.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

epafdec.c

…

ffm.h

…

ffmdec.c

…

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

avformat/flac_picture: clear padding area

2014-01-31 17:32:32 +01:00

flac_picture.h

…

flacdec.c

…

flacenc_header.c

…

flacenc.c

lavf/flacenc: fix comment after previous change

2014-01-24 22:41:06 +01:00

flacenc.h

…

flic.c

…

flv.h

…

flvdec.c

avformat/flvdec: discard inconsistent timestamps

2014-03-12 01:50:41 +01:00

flvenc.c

Warn if s16be is muxed into flv.

2014-01-16 00:38:27 +01:00

format.c

…

framecrcenc.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

framehash.c

…

frmdec.c

…

ftp.c

lavf/ftp: fix seek to nagative position

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

g722.c

…

g723_1.c

…

g729dec.c

…

gif.c

…

gifdec.c

…

golomb_tab.c

avformat: fix hevcs use of golomb from avformat

2014-03-09 22:59:46 +01:00

gopher.c

…

gsmdec.c

…

gxf.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

gxf.h

…

gxfenc.c

…

h261dec.c

…

h263dec.c

…

h264dec.c

…

hdsenc.c

avformat/hdsenc: check mkdir() return code

2014-01-31 03:08:49 +01:00

hevc.c

Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'

2014-03-10 23:38:01 +01:00

hevc.h

Merge commit '34bbc81de8a49fbddb92b76dc733f40890480b2b'

2014-03-10 23:38:01 +01:00

hevcdec.c

…

hls.c

avformat/hls: Fix cookies and user agent with encrypted HLS streams

2014-01-28 18:50:58 +01:00

hlsenc.c

HLS: Handle the case when hls_list_size=0. Playlist file should contain all the segments. Fixes bug #3376.

2014-03-01 15:13:23 +01:00

hlsproto.c

…

hnm.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

http.c

Merge remote-tracking branch 'qatar/master'

2014-03-12 23:24:19 +01:00

http.h

…

httpauth.c

avformat/httpauth: add comment about "" and algorithm

2014-03-03 17:04:57 +01:00

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

lavf/id3v2enc: use metadata_header_padding

2014-01-24 22:50:06 +01:00

id3v2enc.c

lavf/id3v2enc: update comment about minimum padding

2014-01-24 22:52:33 +01:00

idcin.c

…

idroqdec.c

…

idroqenc.c

RoQ encoder: support different integer framerates

2014-02-03 02:04:38 +01:00

iff.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

ilbc.c

…

img2.c

…

img2dec.c

…

img2enc.c

…

ingenientdec.c

…

internal.h

lavf: add write_uncoded_frame() API.

2014-02-11 10:29:02 +01:00

ipmovie.c

…

ircam.c

…

ircam.h

…

ircamdec.c

…

ircamenc.c

…

isom.c

Merge commit '4f3db5d3418a24f3b90422e98ad75388052c4284'

2014-03-09 23:13:37 +01:00

isom.h

avformat/mov: redesign the fps calculation

2014-01-22 00:33:38 +01:00

iss.c

…

iv8.c

…

ivfdec.c

…

ivfenc.c

…

jacosubdec.c

…

jacosubenc.c

…

jvdec.c

Merge commit '8a2250344b19a343d830a902dbcf4c0b929ea49b'

2014-02-14 01:51:17 +01:00

latmenc.c

…

libavformat.v

…

libgme.c

…

libmodplug.c

Fix modplug linkage on Windows.

2014-03-11 13:22:49 +01:00

libnut.c

…

libquvi.c

…

librtmp.c

avformat/librtmp: Fix memory leak if RTMP_ConnectStream() fails

2014-01-14 01:59:23 +01:00

libssh.c

lavf/libssh: fix seek to nagative position

2014-02-28 00:04:29 +01:00

lmlm4.c

…

loasdec.c

…

log2_tab.c

…

lvfdec.c

…

lxfdec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

m4vdec.c

…

Makefile

Merge commit 'a823d0948683bd97dd58556b5740e434166209a8'

2014-03-09 23:34:17 +01:00

matroska.c

…

matroska.h

…

matroskadec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

matroskaenc.c

Merge remote-tracking branch 'qatar/master'

2014-03-09 23:41:02 +01:00

md5enc.c

…

md5proto.c

…

metadata.c

avformat/metadata: allow ff_metadata_conv() to be called with NULL saftely

2014-01-17 23:09:52 +01:00

metadata.h

…

mgsts.c

…

microdvddec.c

avformat/microdvd: export the declared frame rate

2014-03-03 23:33:47 +01:00

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

Merge remote-tracking branch 'cehoyos/master'

2014-03-12 12:20:06 +01:00

movenc.c

mvformat/movenc: fix IMX

2014-03-13 01:28:43 +01:00

movenc.h

…

movenchint.c

…

mp3dec.c

avformat/mp3dec: optimize mp3_seek() for dir < 0

2014-03-02 00:20:31 +01:00

mp3enc.c

lavf/id3v2enc: use metadata_header_padding

2014-01-24 22:50:06 +01:00

mpc8.c

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

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

mpc.c

…

mpeg.c

…

mpeg.h

…

mpegenc.c

…

mpegts.c

mpegts: use goto out instead of break on truncated or invalid pmt tables

2014-03-05 02:28:25 +01:00

mpegts.h

avformat/mpegtsenc: fix HEVC MPEG TS stream type

2014-03-04 15:44:04 +01:00

mpegtsenc.c

avformat/mpegtsenc: fix HEVC MPEG TS stream type

2014-03-04 15:44:04 +01:00

mpegvideodec.c

…

mpjpeg.c

…

mpl2dec.c

…

mpsubdec.c

…

msnwc_tcp.c

…

mtv.c

libavformat/mtv: add test for audio magic

2014-02-01 21:09:14 -08:00

mux.c

avformat/mux: support shifting timestamps so they start at 0

2014-02-22 22:39:49 +01:00

mvdec.c

…

mvi.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

mxf.c

Merge commit 'e118bb1a33889d4df56f28975b4fd0793b4f5c32'

2014-03-06 22:21:57 +01:00

mxf.h

mxf: Introduce ff_mxf_get_samples_per_frame

2014-03-06 19:28:20 +01:00

mxfdec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

mxfenc.c

…

mxg.c

…

ncdec.c

…

network.c

…

network.h

Merge remote-tracking branch 'qatar/master'

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

nistspheredec.c

…

noproxy-test.c

…

nsvdec.c

…

nullenc.c

…

nut.c

avformat/nut: add bayer colorspaces

2014-02-22 20: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/nutenc: fix missing break in switch

2014-01-24 04:17:15 +01:00

nuv.c

…

oggdec.c

oggdec: validate VP8 keyframes

2014-02-24 02:24:21 +01:00

oggdec.h

ogg: allow streams to update metadata

2014-02-05 22:36:42 +01:00

oggenc.c

Merge commit 'b0c2c097e422b9e10a7d856582f8321d28af821e'

2014-02-09 20:04:01 +01:00

oggparsecelt.c

…

oggparsedirac.c

…

oggparseflac.c

…

oggparseogm.c

Merge commit '75647dea6f7db79b409bad66a119f5c73da730f3'

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

oggparseopus.c

lavf/oggparseopus: Setting seek_preroll in AVCodecContext

2014-02-05 21:16:36 +01:00

oggparseskeleton.c

…

oggparsespeex.c

…

oggparsetheora.c

…

oggparsevorbis.c

avformat/oggparsevorbis: dont use invalid granules

2014-03-05 17:07:28 +01:00

oggparsevp8.c

oggdec: add support for VP8 demuxing

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

oma.c

…

oma.h

…

omadec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

omaenc.c

…

options_table.h

avformat: extracting NTP timestamp from RTCP

2014-03-12 13:33:14 +01:00

options.c

Merge commit '33c859c142ef3f49b7a6227014ad92a680cf4d74'

2014-02-04 15:37:05 +01:00

os_support.c

…

os_support.h

…

paf.c

…

pcm.c

…

pcm.h

…

pcmdec.c

pcmdec: replace a reachable assert with an error check

2014-02-10 07:41:21 +01:00

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

…

pva.c

…

pvfdec.c

…

qcp.c

…

qtpalette.h

…

r3d.c

…

rawdec.c

…

rawdec.h

…

rawenc.c

Add raw HEVC muxer

2014-02-09 14:29:07 +00:00

rawenc.h

…

rawvideodec.c

…

rdt.c

…

rdt.h

…

realtextdec.c

…

redspark.c

…

riff.c

riff: add VP9 fourcc

2014-03-09 18:09:39 +01:00

riff.h

avformat/riff: return error code from ff_get_guid()

2014-02-12 15:59:15 +01:00

riffdec.c

avformat/riff: return error code from ff_get_guid()

2014-02-12 15:59:15 +01:00

riffenc.c

Support writing E-AC3 in wav.

2014-01-29 00:48:50 +01:00

rl2.c

…

rm.c

…

rm.h

…

rmdec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

rmenc.c

…

rmsipr.c

…

rmsipr.h

…

rpl.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

rsd.c

…

rso.c

…

rso.h

…

rsodec.c

…

rsoenc.c

…

rtmp.h

…

rtmpcrypt.c

…

rtmpcrypt.h

…

rtmpdh.c

…

rtmpdh.h

…

rtmphttp.c

…

rtmppkt.c

Merge remote-tracking branch 'qatar/master'

2014-03-07 14:09:35 +01:00

rtmppkt.h

Merge remote-tracking branch 'qatar/master'

2014-03-07 14:09:35 +01:00

rtmpproto.c

Merge commit '24eb3c791606fe98a1591c13a8b2ba6c342bb3b5'

2014-01-21 04:13:57 +01:00

rtp.c

…

rtp.h

…

rtpdec_amr.c

…

rtpdec_asf.c

Merge remote-tracking branch 'qatar/master'

2014-01-23 20:15:21 +01:00

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_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: extracting NTP timestamp from RTCP

2014-03-12 13:33:14 +01:00

rtpenc.h

…

rtpproto.c

…

rtpproto.h

…

rtsp.c

avformat: extracting NTP timestamp from RTCP

2014-03-12 13:33:14 +01:00

rtsp.h

Add "prefer_tcp" flag to "rtsp_flags"

2014-03-04 22:54:13 +01:00

rtspcodes.h

…

rtspdec.c

…

rtspenc.c

avformat: extracting NTP timestamp from RTCP

2014-03-12 13:33:14 +01:00

samidec.c

…

sapdec.c

…

sapenc.c

avformat: extracting NTP timestamp from RTCP

2014-03-12 13:33:14 +01:00

sauce.c

…

sauce.h

…

sbgdec.c

…

sctp.c

…

sdp.c

Merge remote-tracking branch 'qatar/master'

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

sdr2.c

avformat/sdr2: h264 stream needs parsing

2014-02-26 17:46:45 +00: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

avformat/HLS: modified EXT-X-MEDIA-SEQUENCE header in order to follow the HLS standard

2014-03-03 16:46:22 +01:00

sierravmd.c

…

siff.c

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

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

smacker.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

smjpeg.c

…

smjpeg.h

…

smjpegdec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

smjpegenc.c

…

smoothstreamingenc.c

…

smush.c

…

sol.c

…

sox.h

…

soxdec.c

…

soxenc.c

…

spdif.c

…

spdif.h

…

spdifdec.c

…

spdifenc.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

srtdec.c

…

srtenc.c

…

srtp.c

…

srtp.h

…

srtpproto.c

…

subfile.c

lavf: add subfile protocol.

2014-03-08 12:36:57 +01:00

subtitles.c

…

subtitles.h

…

subviewer1dec.c

…

subviewerdec.c

…

swf.c

…

swf.h

…

swfdec.c

…

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

avformat/tls: Fix windows build with openSSL enabled.

2014-01-23 14:33:56 +01:00

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

uncodedframecrcenc.c

lavf: add uncodedframecrc test muxer.

2014-02-11 10:29:02 +01:00

unix.c

…

url-test.c

…

url.c

…

url.h

…

urldecode.c

…

urldecode.h

…

utils.c

Merge remote-tracking branch 'qatar/master'

2014-03-13 14:21:27 +01:00

vc1test.c

…

vc1testenc.c

…

version.h

avformat: extracting NTP timestamp from RTCP

2014-03-12 13:33:14 +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

…

wtv_common.c

…

wtv.h

…

wtvdec.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

wtvenc.c

Move GUID-related objects to riffenc.c and riff.c.

2014-01-29 00:44:59 +01:00

wv.c

…

wv.h

…

wvdec.c

…

wvenc.c

…

xa.c

…

xmv.c

Merge commit 'd92024f18fa3d69937cb2575f3a8bf973df02430'

2014-03-11 21:05:34 +01:00

xwma.c

…

yop.c

…

yuv4mpeg.c

Merge commit '5ef11b8dcc054b230deb9b20493255c14a80597d'

2014-01-17 16:18:40 +01:00