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

* qatar/master:
  Revert "avconv: use stream copy by default when possible."
  avconv: print stream copy information.
  avconv: use stream copy by default when possible.
  matroskaenc: vertical alignment.
  matroskaenc: implement query_codec()
  lavf: add avformat_query_codec().
  lavc: add avcodec_get_type() for mapping codec_id -> type.
  flvenc: use int64_t to store offsets
  avconv: don't segfault on 0 input files.
  Do not write ID3v1 tags by default
  mpegts: log into an AVFormatContext rather than MpegTSContext.

Conflicts:
	doc/APIchanges
	libavcodec/version.h
	libavformat/avformat.h
	libavformat/mp3enc.c

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

2011-08-17 14:23:20 +02:00

..

4xm.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

a64.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

aacdec.c

Limit fsize before adding to pointer.

2011-07-31 19:40:08 +02:00

ac3dec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

adts.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

adtsenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

aea.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

aiff.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

aiffdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

aiffenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

allformats.c

Initial caf muxer.

2011-05-15 03:25:57 +02:00

amr.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

anm.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

apc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

ape.c

Merge remote-tracking branch 'qatar/master'

2011-07-26 15:37:22 +02:00

apetag.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

apetag.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

applehttp.c

Merge remote-tracking branch 'qatar/master'

2011-08-04 20:59:36 +02:00

applehttpproto.c

Merge remote branch 'qatar/master'

2011-05-13 04:40:40 +02:00

asf.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

asf.h

Merge remote branch 'qatar/master'

2011-04-17 23:43:54 +02:00

asfcrypt.c

Merge remote-tracking branch 'qatar/master'

2011-06-24 03:07:04 +02:00

asfcrypt.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

asfdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

asfenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

assdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

assenc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

au.c

Support streaming .au files.

2011-08-14 00:05:36 +02:00

audiointerleave.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

audiointerleave.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avc.c

Merge remote branch 'qatar/master'

2011-04-04 02:15:12 +02:00

avc.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avformat.h

Merge remote-tracking branch 'qatar/master'

2011-08-17 14:23:20 +02:00

avi.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avi.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avidec.c

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

avienc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

avio_internal.h

Merge remote-tracking branch 'qatar/master'

2011-05-22 04:53:19 +02:00

avio.c

Simplify code and avoid compiler warning about incompatible types.

2011-06-01 20:29:27 +02:00

avio.h

Merge remote-tracking branch 'qatar/master'

2011-07-03 03:14:10 +02:00

aviobuf.c

Merge remote-tracking branch 'qatar/master'

2011-07-16 19:43:35 +02:00

avisynth.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

avlanguage.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avlanguage.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

avs.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

bethsoftvid.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

bfi.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

bink.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

c93.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

caf.c

Cosmetics: Restore alphabetical order.

2011-08-01 00:58:49 +02:00

caf.h

Move channel chunk reading function to isom.c.

2011-04-28 10:45:32 +02:00

cafdec.c

Use little endian for caf codec tags.

2011-07-24 23:52:42 +02:00

cafenc.c

Support muxing MP1, MP2 and MP3 in caf.

2011-08-01 00:58:49 +02:00

cavsvideodec.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 23:48:22 +02:00

cdg.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

concat.c

Merge remote branch 'qatar/master'

2011-04-09 03:17:07 +02:00

crcenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

crypto.c

crypto: Use av_freep instead of av_free

2011-06-09 02:43:55 +02:00

cutils.c

Merge commit '85770f2a2651497861ed938efcd0df3696ff5e45'

2011-05-01 00:26:05 +02:00

daud.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

dfa.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

diracdec.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 23:48:22 +02:00

dnxhddec.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 23:48:22 +02:00

dsicin.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

dtsdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

dv.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

dv.h

Make DV (sub) demuxer set proper pkt->pos values.

2011-05-02 18:38:01 +02:00

dvenc.c

fifo: add av_fifo_peek2(), and deprecate av_fifo_peek()

2011-08-14 01:56:28 +02:00

dxa.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

eacdata.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

electronicarts.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

ffm.h

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

ffmdec.c

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

ffmenc.c

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

ffmeta.h

Merge remote-tracking branch 'qatar/master'

2011-05-22 04:53:19 +02:00

ffmetadec.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

ffmetaenc.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

file.c

Merge remote branch 'qatar/master'

2011-05-05 03:30:24 +02:00

filmstripdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

filmstripenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

flacdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

flacenc_header.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

flacenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

flacenc.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

flic.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

flv.h

Merge remote-tracking branch 'qatar/master'

2011-07-15 17:51:09 +02:00

flvdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

flvenc.c

Merge remote-tracking branch 'qatar/master'

2011-08-17 14:23:20 +02:00

framecrcenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

gif.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

gopher.c

Merge remote branch 'qatar/master'

2011-04-21 03:37:05 +02:00

gxf.c

Warn when falling back to unreliable UMF fps tag.

2011-08-03 20:06:38 +02:00

gxf.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

gxfenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-18 16:43:46 +02:00

h261dec.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 23:48:22 +02:00

h263dec.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 23:48:22 +02:00

h264dec.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 23:48:22 +02:00

http.c

lavf: use designated initializers for AVClasses.

2011-05-17 23:01:42 +02:00

http.h

Merge remote branch 'qatar/master'

2011-04-09 03:17:07 +02:00

httpauth.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

httpauth.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

id3v1.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

id3v1.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

id3v2.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

id3v2.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

idcin.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

idroqdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

idroqenc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

iff.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

img2.c

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

ingenientdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

internal.h

Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'

2011-07-14 02:24:10 +02:00

ipmovie.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

isom.c

Merge remote-tracking branch 'qatar/master'

2011-06-22 05:16:40 +02:00

isom.h

Fix ff_mov_write_chan() so it can be used by other muxers.

2011-05-17 01:47:12 +02:00

iss.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

iv8.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

ivfdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

ivfenc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

jvdec.c

Merge remote branch 'qatar/master'

2011-04-07 03:32:26 +02:00

libavformat.v

Hide demuxers', muxers' and protocols' objects via the ld version script.

2011-01-30 03:40:58 +01:00

libnut.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

librtmp.c

Merge remote-tracking branch 'qatar/master'

2011-07-06 01:34:08 +02:00

lmlm4.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

lxfdec.c

Merge remote branch 'qatar/master'

2011-04-07 03:32:26 +02:00

m4vdec.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 23:48:22 +02:00

Makefile

Merge commit 'b5849f77095439e994b11c25e6063d443b36c228'

2011-07-14 02:24:10 +02:00

matroska.c

matroska: improve declaration of video_stereo_* constant tables

2011-05-24 23:34:24 +02:00

matroska.h

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

matroskadec.c

Fix several security issues in matroskadec.c (MSVR-11-0080).

2011-07-28 14:59:54 +02:00

matroskaenc.c

Merge remote-tracking branch 'qatar/master'

2011-08-17 14:23:20 +02:00

md5enc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

md5proto.c

Merge remote branch 'qatar/master'

2011-04-20 04:48:23 +02:00

metadata.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

metadata.h

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

microdvddec.c

add MicroDVD muxer and demuxer

2011-04-04 01:29:40 +02:00

microdvdenc.c

add MicroDVD muxer and demuxer

2011-04-04 01:29:40 +02:00

mm.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mmf.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mms.c

Merge remote branch 'qatar/master'

2011-04-20 04:48:23 +02:00

mms.h

Merge remote-tracking branch 'qatar/master'

2011-05-22 04:53:19 +02:00

mmsh.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

mmst.c

Add some forgotten const to function arguments in libavfilter & libavformat.

2011-05-17 03:05:36 +02:00

mov.c

mov: Set negative Sample_duration in STTS to 1

2011-08-13 03:39:58 +02:00

movenc.c

Merge remote-tracking branch 'qatar/master'

2011-08-16 23:47:35 +02:00

movenc.h

Merge remote-tracking branch 'qatar/master'

2011-06-11 03:51:36 +02:00

movenchint.c

Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

2011-07-11 04:23:25 +02:00

mp3dec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mp3enc.c

Merge remote-tracking branch 'qatar/master'

2011-08-17 14:23:20 +02:00

mpc8.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mpc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mpeg.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mpeg.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

mpegenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mpegts.c

mpegts: log into an AVFormatContext rather than MpegTSContext.

2011-08-16 11:09:39 -07:00

mpegts.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

mpegtsenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mpegvideodec.c

Merge remote-tracking branch 'qatar/master'

2011-05-27 23:48:22 +02:00

mpjpeg.c

Rename ffserver to avserver.

2011-08-09 19:56:25 +02:00

msnwc_tcp.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mtv.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mvi.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

mxf.c

mxf: H.264/MPEG-4 AVC Intra support

2011-08-15 00:40:54 +02:00

mxf.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

mxfdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-30 06:46:08 +02:00

mxfenc.c

mxf: honor timecode drop flag in mxf muxer if set.

2011-08-13 19:13:02 +02:00

mxg.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

ncdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

network.h

Merge remote-tracking branch 'qatar/master'

2011-06-05 03:00:31 +02:00

nsvdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

nullenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

nut.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

nut.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

nutdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

nutenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

nuv.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

oggdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-13 00:42:11 +02:00

oggdec.h

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

oggenc.c

oggenc: add missing initializer braces to shut up gcc warning.

2011-08-10 21:03:39 +02:00

oggparsecelt.c

Fix various unused variable warnings

2011-05-30 00:24:01 +02:00

oggparsedirac.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

oggparseflac.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

oggparseogm.c

Remove unused variables

2011-06-02 20:06:00 +01:00

oggparseskeleton.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

oggparsespeex.c

10l, commit that should have been stashed into the merge.

2011-04-17 23:59:00 +02:00

oggparsetheora.c

Always use av_set_pts_info to set the stream time base.

2011-02-06 16:08:59 -05:00

oggparsevorbis.c

Remove all uses of now deprecated metadata functions.

2011-06-08 07:43:45 +02:00

oma.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

options.c

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

os_support.c

Merge remote branch 'qatar/master'

2011-05-13 04:40:40 +02:00

os_support.h

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

pcm.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

pcm.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

pcmdec.c

Merge remote-tracking branch 'qatar/master'

2011-05-26 03:28:22 +02:00

pcmenc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

pmpdec.c

Add PlayStation Portable PMP format demuxer

2011-04-06 19:30:42 +02:00

psxstr.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

pva.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

qcp.c

Merge remote-tracking branch 'qatar/master'

2011-07-15 17:51:09 +02:00

qtpalette.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

r3d.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

rawdec.c

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

rawdec.h

Merge remote-tracking branch 'qatar/master'

2011-06-05 03:00:31 +02:00

rawenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

rawenc.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rawvideodec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

rdt.c

Merge remote-tracking branch 'qatar/master'

2011-06-18 05:10:38 +02:00

rdt.h

Merge remote-tracking branch 'qatar/master'

2011-07-14 20:44:58 +02:00

riff.c

AVCodecTag: Add MKTAG for Go2Meeting video codec

2011-08-09 21:53:48 +02:00

riff.h

Merge commit 'a3a0af4fb1237bed0af75868073f9a63db8b1864'

2011-04-15 04:50:06 +02:00

rl2.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

rm.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rm.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rmdec.c

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

rmenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

rpl.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

rso.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rso.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rsodec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rsoenc.c

Merge remote branch 'qatar/master'

2011-04-04 02:15:12 +02:00

rtmp.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtmppkt.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

rtmppkt.h

Merge remote-tracking branch 'qatar/master'

2011-07-03 03:14:10 +02:00

rtmpproto.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

rtp.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtp.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpdec_amr.c

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

rtpdec_asf.c

Merge remote-tracking branch 'qatar/master'

2011-06-18 05:10:38 +02:00

rtpdec_formats.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpdec_h263.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpdec_h264.c

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

rtpdec_latm.c

Merge remote-tracking branch 'qatar/master'

2011-06-03 05:19:30 +02:00

rtpdec_mpeg4.c

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

rtpdec_qcelp.c

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

rtpdec_qdm2.c

Merge remote branch 'qatar/master'

2011-05-13 04:40:40 +02:00

rtpdec_qt.c

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

rtpdec_svq3.c

Merge remote-tracking branch 'qatar/master'

2011-07-15 17:51:09 +02:00

rtpdec_vp8.c

Merge remote-tracking branch 'qatar/master'

2011-07-15 17:51:09 +02:00

rtpdec_xiph.c

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

rtpdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-22 12:08:52 +02:00

rtpdec.h

Merge remote branch 'qatar/master'

2011-04-24 03:41:22 +02:00

rtpenc_aac.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpenc_amr.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpenc_chain.c

Merge remote-tracking branch 'qatar/master'

2011-06-18 05:10:38 +02:00

rtpenc_chain.h

Merge remote branch 'qatar/master'

2011-04-09 03:17:07 +02:00

rtpenc_h263.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpenc_h264.c

Make buffer size check consistent and avoid a possible overflow.

2011-06-15 20:21:33 +02:00

rtpenc_latm.c

Merge commit '9446d75941d639f19cfa9ae007eb4c5ca041f200'

2011-06-17 05:49:58 +02:00

rtpenc_mpv.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpenc_vp8.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpenc_xiph.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtpenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

rtpenc.h

Merge remote-tracking branch 'qatar/master'

2011-06-11 03:51:36 +02:00

rtpproto.c

rtp: disable udp fifos, the rtp code cannot work with the fifos in its current form as rtp bypasses the public API.

2011-07-25 16:37:12 +02:00

rtsp.c

Merge remote-tracking branch 'qatar/master'

2011-07-19 18:46:04 +02:00

rtsp.h

Merge remote-tracking branch 'qatar/master'

2011-07-19 18:46:04 +02:00

rtspcodes.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

rtspdec.c

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

rtspenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

sapdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

sapenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

sauce.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

sauce.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

sdp.c

Merge remote-tracking branch 'qatar/master'

2011-06-11 03:51:36 +02:00

seek-test.c

seektest: forgot adding a file (from commit 191c5f8ff33eb995b6dbc5b11af7c1a79f8381f0 during the last merge)

2011-07-14 17:55:15 +02:00

seek.c

Merge remote-tracking branch 'qatar/master'

2011-07-04 00:45:21 +02:00

seek.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

segafilm.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

sierravmd.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

siff.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

smacker.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

sol.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

sox.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

soxdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

soxenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

spdif.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

spdif.h

Merge remote-tracking branch 'qatar/master'

2011-05-22 04:53:19 +02:00

spdifdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

spdifenc.c

Cosmetics: Fix indentation.

2011-08-01 00:58:49 +02:00

srtdec.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

swf.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

swfdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

swfenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

tcp.c

TCP: change default timeout to 5sec

2011-05-30 02:39:26 +02:00

thp.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

tiertexseq.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

timefilter.c

Merge remote branch 'qatar/master'

2011-04-12 03:48:21 +02:00

timefilter.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

tmv.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

tta.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

tty.c

Merge remote-tracking branch 'qatar/master'

2011-08-15 23:35:53 +02:00

txd.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

udp.c

udp: allow fifo size to be tuned seperately

2011-07-25 16:37:12 +02:00

url.h

Merge remote-tracking branch 'qatar/master'

2011-07-14 20:44:58 +02:00

utils.c

Merge remote-tracking branch 'qatar/master'

2011-08-17 14:23:20 +02:00

vc1test.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

vc1testenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

version.h

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

voc.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

voc.h

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

vocdec.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

vocenc.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

vorbiscomment.c

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

vorbiscomment.h

Merge remote-tracking branch 'qatar/master'

2011-06-09 04:47:19 +02:00

vqf.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

wav.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

wc3movie.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

westwood.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

wtv.c

doxygen: Fix parameter names to match the function prototypes.

2011-07-03 18:30:02 +02:00

wtv.h

WTV: Add ff_ prefix to the moved fields.

2011-05-01 21:13:18 +02:00

wtvdec.c

wtvdec: also support big-sectors when fat depth is zero

2011-07-15 16:57:35 +02:00

wv.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

xa.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

xwma.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

yop.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00

yuv4mpeg.c

Merge remote-tracking branch 'qatar/master'

2011-07-17 20:12:02 +02:00