Michael Niedermayer 5b97681eaa Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0' ...

* commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0':
  mpegtsenc: Take max_delay into account when buffering multiple audio packets into one PES packet

Conflicts:
	libavformat/mpegtsenc.c

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

2015-04-03 21:01:40 +02:00

..

4xm.c

…

a64.c

…

aacdec.c

…

ac3dec.c

…

act.c

…

adp.c

…

adtsenc.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

adxdec.c

avformat/adxdec: set avctx->channels in adx_read_header

2015-03-05 15:57:48 +01:00

aea.c

…

afc.c

…

aiff.h

…

aiffdec.c

avformat/aiffdec: do not fail if header parser hits EOF

2015-03-19 01:44:14 +01:00

aiffenc.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

allformats.c

apng: Add a basic APNG muxer

2015-04-02 04:52:59 +02:00

amr.c

…

anm.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

apc.c

…

ape.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

apetag.c

Merge commit 'e1a57cbb1c2752feb9315f748836dc44e58d2dc6'

2015-02-15 21:43:28 +01:00

apetag.h

…

apngdec.c

avformat/apngdec: Use 64bit for ret to avoid overflow

2015-02-20 20:39:04 +01:00

apngenc.c

apng: Add a basic APNG muxer

2015-04-02 04:52:59 +02:00

aqtitledec.c

…

asf.c

…

asf.h

…

asfcrypt.c

…

asfcrypt.h

…

asfdec.c

Merge commit '0af3b65880573aa9b3375362eaab4f84140c7dde'

2015-03-03 21:16:31 +01:00

asfenc.c

asfenc: fix leaking asf->index_ptr on error

2015-03-11 20:24:59 +01:00

assdec.c

…

assenc.c

…

ast.c

…

ast.h

…

astdec.c

…

astenc.c

…

au.c

…

audiointerleave.c

…

audiointerleave.h

…

avc.c

lavf/avc: add buffer padding to extradata allocation

2015-02-05 03:27:55 +01:00

avc.h

…

avformat.h

avformat/avformat: improve the text about headerless formats in avformat_flush()

2015-03-05 00:09:26 +01:00

avformatres.rc

…

avi.h

…

avidec.c

avformat/avidec: also print frame_num in debug output

2015-03-19 16:36:29 +01:00

avienc.c

avformat/avienc: Expand master ODML index when its end is reached

2015-03-19 18:17:16 +01:00

avio_internal.h

Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'

2015-02-28 23:02:42 +01:00

avio.c

lavf: add directory listing API

2015-03-27 18:29:46 +01:00

avio.h

lavf/avio: Add new types to AVIODirEntryType, bump minor version

2015-04-03 04:09:34 +02:00

aviobuf.c

Merge commit 'b97f427fb56bdbf7de8e2d4b72d01114aa6eceda'

2015-03-12 12:38:20 +01:00

avisynth.c

avisynth: Bump minimum required version to interface version 6

2015-04-02 23:52:48 +02:00

avlanguage.c

…

avlanguage.h

…

avr.c

…

avs.c

…

bethsoftvid.c

…

bfi.c

…

bink.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

bintext.c

…

bit.c

avformat/bit: only accept the g729 codec and 1 channel

2015-02-26 23:19:39 +01:00

bluray.c

…

bmv.c

…

boadec.c

Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

2015-02-11 02:47:54 +01:00

brstm.c

…

c93.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

cache.c

fix spelling errors

2015-03-06 21:35:00 +01:00

caf.c

…

caf.h

…

cafdec.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

cafenc.c

…

cavsvideodec.c

avformat/cavsvideodec: use avpriv_find_start_code in cavsvideo_probe()

2015-03-16 15:40:10 +01:00

cdg.c

…

cdxl.c

…

cinedec.c

…

concat.c

…

concatdec.c

…

crcenc.c

…

crypto.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

cutils.c

…

dashenc.c

Merge commit '3041183677bda0a431b36e96a2c76617abaa8183'

2015-03-19 12:18:05 +01:00

data_uri.c

…

dauddec.c

…

daudenc.c

…

dfa.c

…

diracdec.c

…

dnxhddec.c

…

dsfdec.c

…

dsicin.c

…

dss.c

avformat/dss: implement seeking

2015-02-26 02:06:10 +01:00

dtsdec.c

Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'

2015-03-04 19:28:53 +01:00

dtshddec.c

…

dump.c

…

dv.c

avformat/dv: fix used dimension variables

2015-03-26 03:10:27 +01:00

dv.h

…

dvbsub.c

avformat/dvbsub: Fix hypothetical pointer overflow in dvbsub_probe()

2015-03-15 13:45:31 +01:00

dvenc.c

…

dxa.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

eacdata.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

electronicarts.c

…

epafdec.c

…

ffm.h

…

ffmdec.c

ffmdec: limit the backward seek to the last resync position

2015-03-09 15:19:34 +01:00

ffmenc.c

avformat/ffmenc: Use ffio_free_dyn_buf()

2015-02-27 13:38:43 +01:00

ffmeta.h

…

ffmetadec.c

…

ffmetaenc.c

…

file_open.c

…

file.c

…

filmstripdec.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

filmstripenc.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

flac_picture.c

…

flac_picture.h

…

flacdec.c

…

flacenc_header.c

…

flacenc.c

avformat/flacenc: Use av_clip_uintp2()

2015-02-21 14:43:28 +01:00

flacenc.h

…

flic.c

…

flv.h

…

flvdec.c

avformat/flvdec: add support for OnCaption

2015-03-13 16:25:27 +01:00

flvenc.c

Revert "avformat/flvenc: Allow muxing video codecs which are not explicitly supported by the muxer"

2015-03-22 17:19:25 +01:00

format.c

…

framecrcenc.c

…

framehash.c

…

frmdec.c

…

ftp.c

lavf/ftp: remove fixed length buffers from context

2015-04-03 00:10:09 +02:00

g722.c

…

g723_1.c

…

g729dec.c

…

gif.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

gifdec.c

lavf/gif: Add an option max_gif_delay to limit the frame duration.

2015-03-29 12:31:00 +02:00

golomb_tab.c

…

gopher.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

gsmdec.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

gxf.c

avformat/gxf: Use 64bit for res to avoid overflow

2015-02-20 20:14:56 +01:00

gxf.h

…

gxfenc.c

…

h261dec.c

…

h263dec.c

…

h264dec.c

…

hdsenc.c

…

hevc.c

…

hevc.h

…

hevcdec.c

…

hls.c

libavformat/hls: add an option to start from a given segment in a live stream

2015-03-29 13:34:15 +02:00

hlsenc.c

avformat/hlsenc: Warn if a non file protocol is used

2015-02-23 16:53:36 +01:00

hlsproto.c

…

hnm.c

…

http.c

avformat/http: Fix null check on allocated value

2015-03-31 12:38:02 +02:00

http.h

…

httpauth.c

…

httpauth.h

…

icecast.c

…

icodec.c

…

icoenc.c

…

id3v1.c

…

id3v1.h

…

id3v2.c

Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'

2015-02-25 00:48:50 +01:00

id3v2.h

…

id3v2enc.c

…

idcin.c

avformat/idcin: Use 64bit for ret to avoid overflow

2015-02-20 20:13:06 +01:00

idroqdec.c

…

idroqenc.c

…

iff.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

ilbc.c

…

img2_alias_pix.c

…

img2_brender_pix.c

…

img2.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

img2.h

avformat/img2: Change enum to int, which is accessed via AVOption as int

2015-03-30 00:08:57 +02:00

img2dec.c

avformat: Don't anonymously typedef structs

2015-02-14 10:13:47 -08:00

img2enc.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

ingenientdec.c

…

internal.h

Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

2015-02-11 02:47:54 +01:00

ipmovie.c

…

ircam.c

…

ircam.h

…

ircamdec.c

…

ircamenc.c

…

isom.c

Merge commit '96dd04427fc46e5e25a5ac1f00753207e3aedb0c'

2015-03-17 20:05:53 +01:00

isom.h

mov: Add option to keep exact packet sequence after seeking

2015-03-18 14:30:07 +00:00

iss.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

iv8.c

…

ivfdec.c

…

ivfenc.c

…

jacosubdec.c

…

jacosubenc.c

…

jvdec.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

latmenc.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

libavformat.v

…

libgme.c

…

libmodplug.c

…

libnut.c

…

libquvi.c

…

librtmp.c

…

libsmbclient.c

…

libssh.c

lavf/libssh: support reading config from ~/.ssh/config

2015-03-11 01:34:37 +01:00

lmlm4.c

…

loasdec.c

…

log2_tab.c

…

lrc.c

…

lrc.h

…

lrcdec.c

…

lrcenc.c

…

lvfdec.c

…

lxfdec.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

m4vdec.c

…

Makefile

apng: Add a basic APNG muxer

2015-04-02 04:52:59 +02:00

matroska.c

mkv: Add support for DVB subtitles

2015-03-15 23:49:17 +01:00

matroska.h

…

matroskadec.c

Merge commit '6bdae41d3ef74a0865e8f87896e649f93b2f39bd'

2015-03-12 23:51:44 +01:00

matroskaenc.c

lavf/matroskaenc: List subtitle codecs with fake codec_tags to allow remuxing.

2015-03-24 10:07:18 +01:00

md5enc.c

…

md5proto.c

…

metadata.c

…

metadata.h

…

mgsts.c

…

microdvddec.c

…

microdvdenc.c

…

mkvtimestamp_v2.c

…

mlvdec.c

lavf/mlv: Only add streams that are supposed to contain frames.

2015-02-07 16:23:36 +01:00

mm.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

mmf.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

mms.c

Merge commit '93c1b04abfc0dd31211a18bf2c0041d69cd16919'

2015-03-22 03:52:37 +01:00

mms.h

…

mmsh.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

mmst.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

mov_chan.c

…

mov_chan.h

…

mov.c

avformat/mov: check color parameter type explicitly.

2015-03-24 14:06:03 +01:00

movenc.c

Merge commit 'e0046bc9c96150fa06146ace9093f06857dd7b23'

2015-03-23 20:33:09 +01:00

movenc.h

Merge commit '67a2912307c3c08f2725ccae162cfe3426b80184'

2015-03-19 13:38:25 +01:00

movenchint.c

Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'

2015-02-25 00:48:50 +01:00

mp3dec.c

avformat/mp3dec: offset seek index to end of id3v2 tag

2015-03-31 23:22:07 +02:00

mp3enc.c

…

mpc8.c

avformat/mpc8: Add () to protect MKMPCTAG()s arguments

2015-02-16 23:14:27 +01:00

mpc.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

mpeg.c

avformat/mpeg: remove unneeded #include, there are no assert() only av_assert*

2015-01-31 08:57:06 +00:00

mpeg.h

…

mpegenc.c

avformat/mpegenc: Ignore max_delay if no other options remain

2015-03-01 16:47:36 +01:00

mpegts.c

avformat/mpegts: Fix potential pointer overflows

2015-03-16 22:37:46 +01:00

mpegts.h

…

mpegtsenc.c

Merge commit '7d097a0fc57f0fa8385962a539c657c2f40b5ed0'

2015-04-03 21:01:40 +02:00

mpegvideodec.c

avformat/mpegvideodec: fix hypothetical pointer overflow in mpegvideo_probe()

2015-03-15 13:39:56 +01:00

mpjpeg.c

…

mpl2dec.c

…

mpsubdec.c

…

msnwc_tcp.c

…

mtv.c

Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

2015-02-11 02:47:54 +01:00

mux.c

Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

2015-02-11 02:47:54 +01:00

mvdec.c

avformat/mvdec: Use 64bit for ret to avoid overflow

2015-02-20 20:41:35 +01:00

mvi.c

…

mxf.c

libavformat/mxf.c: Relaxed ProRes pattern

2015-04-03 13:26:39 +02:00

mxf.h

libavformat/mxfdec: export user comments metadata

2015-03-14 22:46:18 +01:00

mxfdec.c

libavformat/mxfdec: fix MXFPackage->comment_refs memory leak

2015-03-16 03:37:44 +01:00

mxfenc.c

libavformat/mxfenc.c: Add 'Presentation Y offset' metadata

2015-03-30 15:03:41 +02:00

mxg.c

…

ncdec.c

…

network.c

avformat/network: Check for av_malloc* failures in ff_tls_init()

2015-02-03 02:21:55 +01:00

network.h

avformat/network: Check for av_malloc* failures in ff_tls_init()

2015-02-03 02:21:55 +01:00

nistspheredec.c

…

noproxy-test.c

…

nsvdec.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

nullenc.c

…

nut.c

…

nut.h

…

nutdec.c

avformat/nutdec: Use av_malloc_array()

2015-03-30 04:32:58 +02:00

nutenc.c

Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'

2015-02-25 00:48:50 +01:00

nuv.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

oggdec.c

oggdec: Check memory allocation

2015-03-21 23:18:15 +01:00

oggdec.h

…

oggenc.c

ogg: check memory allocations

2015-02-15 18:20:54 +01:00

oggparsecelt.c

…

oggparsedirac.c

…

oggparseflac.c

…

oggparseogm.c

…

oggparseopus.c

…

oggparseskeleton.c

…

oggparsespeex.c

…

oggparsetheora.c

…

oggparsevorbis.c

…

oggparsevp8.c

…

oma.c

…

oma.h

…

omadec.c

avformat/omadec: Use 64bit for ret to avoid overflow

2015-02-20 21:01:54 +01:00

omaenc.c

…

options_table.h

…

options.c

Merge commit 'c86d8aed748adc3ba8df96fb1fe14aa45da77a31'

2015-02-28 23:02:42 +01:00

os_support.c

…

os_support.h

…

paf.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

pcm.c

Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

2015-02-11 02:47:54 +01:00

pcm.h

…

pcmdec.c

…

pcmenc.c

…

pjsdec.c

…

pmpdec.c

…

psxstr.c

…

pva.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

pvfdec.c

…

qcp.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

qtpalette.h

…

r3d.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

rawdec.c

…

rawdec.h

…

rawenc.c

…

rawenc.h

…

rawvideodec.c

…

rdt.c

Merge commit 'b72b212a4c43563f1b9fc3ce9a5ff91f89b857ac'

2015-03-05 01:40:03 +01:00

rdt.h

…

realtextdec.c

…

redspark.c

…

replaygain.c

…

replaygain.h

…

riff.c

Merge commit '02d76141d68e38c80f9a205a56b9af10d74f0995'

2015-03-17 20:48:39 +01:00

riff.h

avformat: Add prefix to get_codec_guid()

2015-02-27 19:25:27 +01:00

riffdec.c

…

riffenc.c

avformat: Add prefix to get_codec_guid()

2015-02-27 19:25:27 +01:00

rl2.c

…

rm.c

…

rm.h

…

rmdec.c

avformat/rmdec: fix support for 0 sized mdpr

2015-03-26 02:02:18 +01:00

rmenc.c

rmenc: Check memory allocation

2015-03-21 23:18:14 +01:00

rmsipr.c

…

rmsipr.h

…

rpl.c

avformat/rpl: check av_get_packet() for failure

2015-02-06 16:07:16 +00: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

…

rtmppkt.h

…

rtmpproto.c

…

rtp.c

…

rtp.h

…

rtpdec_ac3.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_amr.c

Merge commit '78791c086bcaf9eb084c27555b31fea8bbb7624a'

2015-02-25 00:03:52 +01:00

rtpdec_asf.c

Merge commit '15621cbbe4ed88409ef40257afaf239487964e98'

2015-03-05 01:12:19 +01:00

rtpdec_dv.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_formats.h

rtpdec: experimental VP9 depacketizer (draft 0)

2015-03-05 10:05:44 +02:00

rtpdec_g726.c

…

rtpdec_h261.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_h263_rfc2190.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_h263.c

Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'

2015-02-24 22:34:08 +01:00

rtpdec_h264.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_hevc.c

Merge commit 'bfeb83a8b7d3fcf09a54d8dbc9c521e10bb17530'

2015-03-09 20:00:11 +01:00

rtpdec_ilbc.c

Merge commit 'ec96a89c3e507cf0fb1f2b159b28a53f2bad9a74'

2015-02-24 23:44:25 +01:00

rtpdec_jpeg.c

Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'

2015-03-31 01:11:02 +02:00

rtpdec_latm.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_mpa_robust.c

Merge commit '2a66a580678dd9401f4d95e01e0958ca51864b6f'

2015-03-04 11:31:55 +01:00

rtpdec_mpeg4.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_mpeg12.c

Merge commit '2b982e92f42a6e661d90b12b6592cd13cae496d4'

2015-02-24 22:34:08 +01:00

rtpdec_mpegts.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_qcelp.c

Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'

2015-02-24 22:55:20 +01:00

rtpdec_qdm2.c

Merge commit '5d8cae45737bed6239bd6b6e0698802dbe1463c8'

2015-02-24 22:55:20 +01:00

rtpdec_qt.c

Merge commit 'c13ab42a0a3979b2c292b2315487f5f5e14ba26b'

2015-03-05 01:20:25 +01:00

rtpdec_svq3.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_vp8.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec_vp9.c

Merge commit 'bacc92b59bfa5d6a1f631e63e46fc1d2fb934e51'

2015-03-11 20:28:45 +01:00

rtpdec_xiph.c

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpdec.c

rtpdec: experimental VP9 depacketizer (draft 0)

2015-03-05 10:05:44 +02:00

rtpdec.h

Merge commit 'd594dbecce5f3af7f80bbf5bb1b516d740b69ccd'

2015-02-25 00:58:39 +01:00

rtpenc_aac.c

Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'

2015-03-01 01:31:49 +01:00

rtpenc_amr.c

Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'

2015-03-01 01:31:49 +01:00

rtpenc_chain.c

Merge commit '8e32b1f0963d01d4f5d4803eb721f162e0d58d9a'

2015-02-25 00:48:50 +01:00

rtpenc_chain.h

…

rtpenc_h261.c

…

rtpenc_h263_rfc2190.c

…

rtpenc_h263.c

…

rtpenc_h264_hevc.c

Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'

2015-02-24 23:30:51 +01:00

rtpenc_jpeg.c

…

rtpenc_latm.c

…

rtpenc_mpegts.c

Merge commit 'cf402d6fa88acd647cdff993429583bec8a34fdc'

2015-03-10 11:17:37 +01:00

rtpenc_mpv.c

…

rtpenc_vp8.c

…

rtpenc_xiph.c

Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'

2015-03-01 01:31:49 +01:00

rtpenc.c

Merge commit '4f6cd883f06f7893a2b60a41e7a4f8ae633dac2f'

2015-03-01 01:31:49 +01:00

rtpenc.h

Merge commit 'c82bf15dca00f67a701d126e47ea9075fc9459cb'

2015-02-24 23:30:51 +01:00

rtpproto.c

Merge commit '8c9c5479c4ba729b4ba868ab541a90b2061a7c2f'

2015-04-01 21:12:47 +02:00

rtpproto.h

…

rtsp.c

Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'

2015-04-01 21:34:20 +02:00

rtsp.h

Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'

2015-04-01 21:34:20 +02:00

rtspcodes.h

…

rtspdec.c

Merge commit 'e3ec6fe7bb2a622a863e3912181717a659eb1bad'

2015-04-01 21:34:20 +02:00

rtspenc.c

…

samidec.c

…

sapdec.c

…

sapenc.c

…

sauce.c

…

sauce.h

…

sbgdec.c

…

sctp.c

Merge commit 'a4c5801070198c1f2af32fa5cf850c330615ac24'

2015-03-15 22:43:10 +01:00

sdp.c

…

sdr2.c

…

seek-test.c

…

segafilm.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

segment.c

lavf/segment: style nits

2015-03-31 04:34:32 +02:00

sierravmd.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

siff.c

avformat/siff: Fix checks and variable types

2015-03-09 21:05:29 +01:00

smacker.c

avformat/smacker: Fix number suffix

2015-02-01 20:00:10 +01:00

smjpeg.c

…

smjpeg.h

…

smjpegdec.c

…

smjpegenc.c

…

smoothstreamingenc.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

smush.c

…

sol.c

…

sox.h

…

soxdec.c

…

soxenc.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

spdif.c

…

spdif.h

…

spdifdec.c

…

spdifenc.c

Merge commit '25f613f8be3b51e4396b93cda131e4631ba54302'

2015-03-04 19:28:53 +01:00

srtdec.c

…

srtenc.c

…

srtp.c

…

srtp.h

…

srtpproto.c

…

stldec.c

…

subfile.c

…

subtitles.c

…

subtitles.h

…

subviewer1dec.c

…

subviewerdec.c

…

supdec.c

…

swf.c

…

swf.h

…

swfdec.c

…

swfenc.c

lavf: Explicitly convert types at function pointer assignment

2015-03-11 23:53:13 +01:00

takdec.c

…

tcp.c

Merge commit 'e14f98c62fdf8744b07419314095d1b3248cce75'

2015-02-28 23:20:39 +01:00

tedcaptionsdec.c

avformat/tedcaptionsdec: add () to protect the argument of ERR_CODE()

2015-02-17 00:05:51 +01:00

tee.c

…

thp.c

avformat/thp: check av_get_packet() for failure

2015-02-06 09:42:53 +00:00

tiertexseq.c

…

tls.c

Merge commit 'b9d2d6843a49f9df1d1ae1afe817d9b48c445919'

2015-02-28 23:32:33 +01:00

tmv.c

…

tta.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

tty.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

txd.c

…

udp.c

avformat/udp: Remove (harmless) duplicated pkt_size entry from AVOption table

2015-03-29 22:10:05 +02:00

uncodedframecrcenc.c

…

unix.c

…

url-test.c

…

url.c

lavf: add directory listing API

2015-03-27 18:29:46 +01:00

url.h

lavf: add directory listing API

2015-03-27 18:29:46 +01:00

urldecode.c

…

urldecode.h

…

utils.c

avformat/utils: Terminate SPS in avci100_1080i_extradata to avoid warnings during parsing

2015-03-24 18:20:40 +01:00

vc1test.c

…

vc1testenc.c

…

version.h

lavf/avio: Add new types to AVIODirEntryType, bump minor version

2015-04-03 04:09:34 +02:00

vivo.c

…

voc.c

…

voc.h

…

vocdec.c

…

vocenc.c

…

vorbiscomment.c

…

vorbiscomment.h

…

vplayerdec.c

…

vqf.c

avformat/vqf: Use 64bit for ret to avoid overflow

2015-02-20 21:00:57 +01:00

w64.c

…

w64.h

…

wavdec.c

…

wavenc.c

avformat/wavenc: Change enum to int, which is accessed via AVOption as int

2015-03-30 00:08:57 +02:00

wc3movie.c

…

webmdashenc.c

avformat/webmdashenc: use AVERROR(ENOMEM) for memory allocation failures

2015-04-01 18:11:48 +02:00

webpenc.c

…

webvttdec.c

…

webvttenc.c

…

westwood_aud.c

…

westwood_vqa.c

…

wtv_common.c

…

wtv.h

…

wtvdec.c

avformat/wtvdec: Use 64bit for ret to avoid overflow

2015-02-20 20:57:31 +01:00

wtvenc.c

avformat: Add prefix to get_codec_guid()

2015-02-27 19:25:27 +01:00

wv.c

…

wv.h

…

wvdec.c

Merge commit 'daf8cf358a098a903d59adb6c0d0cc3262a8c93e'

2015-02-14 21:07:40 +01:00

wvenc.c

…

xa.c

…

xmv.c

…

xwma.c

avformat/xwma: Use ff_alloc_extradata()

2015-04-01 18:25:34 +02:00

yop.c

Merge commit '9deaec782810d098bca11c9332fab2d2f4c5fb78'

2015-02-11 02:47:54 +01:00

yuv4mpeg.h

…

yuv4mpegdec.c

…

yuv4mpegenc.c

…