Michael Niedermayer 03b078721c Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88' ...

* commit '97bf7c03b1338a867da52c159a2afecbdedcfa88':
  doc: git-howto: Leave reviewers time to react before pushing patches
  Include libavutil/channel_layout.h instead of libavutil/audioconvert.h
  lavu: rename audioconvert.* to channel_layout.* and deprecate audioconvert.h

Conflicts:
	doc/APIchanges
	doc/examples/decoding_encoding.c
	doc/git-howto.texi
	ffmpeg_filter.c
	libavcodec/flacdec.c
	libavcodec/imc.c
	libavcodec/mpegaudiodec.c
	libavcodec/utils.c
	libavfilter/asrc_anullsrc.c
	libavfilter/audio.c
	libavfilter/avfilter.c
	libavfilter/avfilter.h
	libavfilter/avfiltergraph.c
	libavfilter/buffer.c
	libavutil/Makefile
	libavutil/audioconvert.h
	libavutil/channel_layout.c
	libavutil/version.h

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

2012-11-12 11:32:11 +01:00

..

4xm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

a64.c

Merge remote-tracking branch 'qatar/master'

2012-11-02 14:57:36 +01:00

aacdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

ac3dec.c

ac3dec: fix uninitialized var warning

2012-08-30 05:17:24 +02:00

act.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

adtsenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

adxdec.c

Replace all CODEC_ID_* with AV_CODEC_ID_*

2012-08-07 16:00:24 +02:00

aea.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

aiff.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

aiffdec.c

aiffdec: read ID3 attached pictures

2012-10-26 01:52:40 +02:00

aiffenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

allformats.c

AVR demuxer

2012-11-05 17:31:22 +00:00

amr.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

anm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

apc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

ape.c

lavf/ape: Fix stream duration calculation

2012-08-23 15:51:51 +02:00

apetag.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

apetag.h

Merge remote-tracking branch 'qatar/master'

2012-07-31 22:41:00 +02:00

apetagenc.c

lavf/apetag: move common stuff between writer and reader to single file

2012-07-29 02:31:27 +00:00

asf.c

Do not map asf metadata key WM/Track to track.

2011-12-31 22:33:58 +01:00

asf.h

asfdec: parse payload extension list

2012-11-03 05:35:35 +01:00

asfcrypt.c

Merge remote-tracking branch 'qatar/master'

2012-03-29 04:11:10 +02:00

asfcrypt.h

…

asfdec.c

asfdec: check stream_index for validity

2012-11-03 05:58:12 +01:00

asfenc.c

asfenc: avoid negative timestamps

2012-09-28 02:40:53 +02:00

assdec.c

Merge remote-tracking branch 'qatar/master'

2012-10-28 14:24:27 +01:00

assenc.c

lavf/assenc: add non strict ts flag.

2012-11-11 22:58:56 +01:00

au.c

lavf/au: check bits per coded sample.

2012-08-18 17:45:58 +02:00

audiointerleave.c

Merge remote-tracking branch 'qatar/master'

2012-11-02 14:57:36 +01:00

audiointerleave.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

avc.c

Merge remote-tracking branch 'qatar/master'

2012-03-25 01:56:53 +01:00

avc.h

Merge remote-tracking branch 'qatar/master'

2012-03-25 01:56:53 +01:00

avformat.h

Merge commit '9221efef7968463f3e3d9ce79ea72eaca082e73f'

2012-11-03 14:24:11 +01:00

avi.h

Merge remote-tracking branch 'qatar/master'

2011-11-28 01:07:11 +01:00

avidec.c

avidec: remove unneeded null check

2012-10-19 21:46:39 +02:00

avienc.c

avienc: force a valid timebase for video

2012-11-01 20:26:59 +01:00

avio_internal.h

avio: redesign ffio_rewind_with_probe_data()

2012-10-13 02:08:59 +02:00

avio.c

Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'

2012-10-28 13:19:11 +01:00

avio.h

Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'

2012-10-11 14:03:12 +02:00

aviobuf.c

avio: detect implicit truncation by assert in avio_w*

2012-10-24 15:42:00 +02:00

avisynth.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

avlanguage.c

Merge remote-tracking branch 'qatar/master'

2011-09-08 22:37:31 +02:00

avlanguage.h

…

avr.c

lavf/avr: make .long_name consistent with others

2012-11-05 20:47:22 +00:00

avs.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

bethsoftvid.c

bethsoftvid: check return value of av_packet_new_side_data()

2012-10-11 19:40:27 +00:00

bfi.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

bink.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

bintext.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

bit.c

bit: check av_new_packet() return value

2012-10-26 15:34:25 +00:00

bluray.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

bmv.c

Replace PIX_FMT_* -> AV_PIX_FMT_*, PixelFormat -> AVPixelFormat

2012-10-08 07:13:26 +02:00

c93.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

cache.c

cache: check lseek() return

2012-10-18 00:55:03 +02:00

caf.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

caf.h

…

cafdec.c

cafdec: fix parsing of chunks which may have unused data

2012-10-28 20:33:29 +00:00

cafenc.c

caf muxer: write metadata

2012-10-26 03:12:45 +00:00

cavsvideodec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

cdg.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

cdxl.c

cdxl: add read_probe function

2012-11-04 20:19:43 +00:00

concat.c

Merge remote-tracking branch 'qatar/master'

2011-12-02 00:51:11 +01:00

crcenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

crypto.c

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

cutils.c

Merge remote-tracking branch 'qatar/master'

2012-02-16 01:34:37 +01:00

daud.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

dfa.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

diracdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

dnxhddec.c

Allow autodetection of some dnxhd files that can be decoded correctly.

2012-10-13 11:59:37 +02:00

dsicin.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

dtsdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

dtshddec.c

dtshd: fix seeking

2012-10-10 15:50:32 +00:00

dv.c

Merge commit '08b028c18dc31b6de741861b9555669dcca4d12a'

2012-10-30 15:28:24 +01:00

dv.h

Merge remote-tracking branch 'qatar/master'

2012-02-16 01:34:37 +01:00

dvenc.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

dxa.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

eacdata.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

electronicarts.c

electronic arts: support rare samples containing adpcm_ea_r1 audio

2012-11-11 12:52:02 +01:00

ffm.h

Merge commit 'a25d912dca9cd553440167e0476c47581359c0fc'

2012-10-17 14:17:55 +02:00

ffmdec.c

ffmdec: remove unused variable

2012-11-08 15:54:14 +01:00

ffmenc.c

ffm: redesign header format to make it extensible

2012-11-05 16:36:44 +01:00

ffmeta.h

…

ffmetadec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

ffmetaenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

file.c

Merge remote-tracking branch 'qatar/master'

2012-10-09 13:06:04 +02:00

filmstripdec.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

filmstripenc.c

filmstripenc: fix rounding that caused fate failure

2012-11-05 00:28:21 +01:00

flacdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

flacenc_header.c

Merge remote-tracking branch 'qatar/master'

2011-12-11 01:05:33 +01:00

flacenc.c

lavf/flacenc: disallow creation of invalid files with -c copy

2012-10-22 08:07:09 +00:00

flacenc.h

…

flic.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

flv.h

Merge remote-tracking branch 'qatar/master'

2012-06-28 23:57:31 +02:00

flvdec.c

flvdec: check return value of create_stream()

2012-10-15 15:59:53 +00:00

flvenc.c

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

framecrcenc.c

framecrcenc: print flags and side data elements

2012-10-03 16:51:30 +02:00

framehash.c

frame{crc/md5}: set the stream timebase from codec timebase.

2012-02-03 09:29:02 +01:00

g722.c

Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

2012-10-26 14:24:57 +02:00

g723_1.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

g729dec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

gif.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

gopher.c

Merge remote-tracking branch 'qatar/master'

2012-01-06 02:45:12 +01:00

gsmdec.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

gxf.c

gxf: avoid null ptr deref without streams.

2012-11-11 20:58:04 +01:00

gxf.h

…

gxfenc.c

gxfenc: fix null ptr dereference

2012-10-19 23:21:41 +02:00

h261dec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

h263dec.c

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

h264dec.c

Merge commit 'ab35ec29a4071871934856c00da7d6ebcc0c095b'

2012-10-04 13:11:45 +02:00

hls.c

hls: fix integer overflow

2012-10-19 23:00:47 +02:00

hlsproto.c

hlsproto: fix integer overflow

2012-10-19 23:24:03 +02:00

http.c

http: add -content_type user option.

2012-10-24 22:15:31 +02:00

http.h

cosmetics: various spelling fixes

2012-07-06 17:08:22 +02:00

httpauth.c

Merge commit 'e002e3291e6dc7953f843abf56fc14f08f238b21'

2012-10-12 14:52:34 +02:00

httpauth.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

icodec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

icoenc.c

Update my email address

2012-10-27 02:06:21 +02:00

id3v1.c

…

id3v1.h

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

id3v2.c

parse ID3v2 chapters

2012-10-28 15:10:28 +00:00

id3v2.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

id3v2enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

idcin.c

idcin: check chunk_size value before using it

2012-10-15 15:48:13 +00:00

idroqdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

idroqenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

iff.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

ilbc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

img2.c

lavc: add xface image decoder and encoder

2012-10-15 08:32:18 +02:00

img2dec.c

Allow forcing a frame size in bytes for image2pipe.

2012-11-10 02:25:17 +01:00

img2enc.c

img2enc: support 16bit per sample yuv in split planes.

2012-11-06 02:27:04 +01:00

ingenientdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

internal.h

mux/nut: factorize ff_choose_timebase() out of nut

2012-10-03 21:34:43 +02:00

ipmovie.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

isom.c

Pinnacle TARGA CineWave YUV16 decoder (fourcc Y216).

2012-10-06 06:20:52 +02:00

isom.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

iss.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

iv8.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

ivfdec.c

Merge remote-tracking branch 'qatar/master'

2012-06-21 22:37:43 +02:00

ivfenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

jacosubdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

jacosubenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

jvdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

latmenc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

libavformat.v

libavformat.v: export ffurl_protocol_next

2012-09-13 16:21:25 +02:00

libmodplug.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

libnut.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

librtmp.c

Merge remote-tracking branch 'qatar/master'

2012-06-04 00:33:42 +02:00

lmlm4.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

loasdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

log2_tab.c

avutil: Duplicate ff_log2_tab instead of sharing it across libs

2012-10-12 20:39:17 +02:00

lvfdec.c

lvfdec: cosmetics: fix identation

2012-10-25 20:57:40 +00:00

lxfdec.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

m4vdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

Makefile

Merge commit '5ff998a233d759d0de83ea6f95c383d03d25d88e'

2012-11-05 22:51:20 +01:00

matroska.c

Merge commit '117d8c6d1f1c187ffc6098d9618457e00534e013'

2012-09-20 19:43:38 +02:00

matroska.h

lavf/mkv: prefix video stereo arrays with ff_.

2012-09-16 02:58:40 +02:00

matroskadec.c

matroskadec: check h in generic rm packet shuffler

2012-11-11 01:19:44 +01:00

matroskaenc.c

matroskaenc: avoid implicit truncation in avio_w*

2012-10-24 15:27:01 +02:00

md5enc.c

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

md5proto.c

Merge commit 'b7f1010c8fce09096057528f7cd29589ea1ae7df'

2012-10-12 15:34:49 +02:00

metadata.c

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

metadata.h

Merge remote-tracking branch 'qatar/master'

2012-01-28 07:53:34 +01:00

mgsts.c

Enable generic index/seeking for mgsts demuxer.

2012-03-26 20:03:57 +02:00

microdvddec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

microdvdenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

mkvtimestamp_v2.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

mm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

mmf.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

mms.c

…

mms.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

mmsh.c

mmsh: fix integer overflow in mmsh_seek()

2012-10-20 20:13:18 +02:00

mmst.c

Merge remote-tracking branch 'qatar/master'

2012-06-20 20:47:46 +02:00

mov_chan.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

mov_chan.h

mov_chan: Pass a separate AVIOContext for reading

2012-09-07 10:49:35 +03:00

mov.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

movenc.c

movenc: remove unneeded check

2012-11-04 01:03:52 +01:00

movenc.h

movenc: support an alternative to edit lists to handle the first DTS != 0 case.

2012-10-07 06:04:40 +02:00

movenchint.c

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

mp3dec.c

mp3dec: remove unused variable

2012-10-29 22:11:21 +01:00

mp3enc.c

mp3enc: remove unneeded null ptr check

2012-10-16 20:27:16 +02:00

mpc8.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

mpc.c

mpc: fix seeking to the end

2012-08-27 05:23:42 +02:00

mpeg.c

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

mpeg.h

…

mpegenc.c

Merge remote-tracking branch 'qatar/master'

2012-10-01 16:12:38 +02:00

mpegts.c

mpegts_probe: detect files with garbage at the begin.

2012-11-01 17:22:04 +01:00

mpegts.h

Merge remote-tracking branch 'qatar/master'

2012-10-06 13:45:08 +02:00

mpegtsenc.c

Merge commit 'b522000e9b2ca36fe5b2751096b9a5f5ed8f87e6'

2012-10-11 14:03:12 +02:00

mpegvideodec.c

mpegvideo_probe: check slice order

2012-11-01 15:08:03 +01:00

mpjpeg.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

msnwc_tcp.c

lavf: add missing new line to some error messages

2012-09-01 15:59:30 +02:00

mtv.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

mux.c

mux: change 1 assert->av_assert1()

2012-10-07 23:31:27 +02:00

mvi.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

mxf.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

mxf.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

mxfdec.c

mxfdec: avoid double free and leaks.

2012-11-11 02:20:04 +01:00

mxfenc.c

mxfenc: Write MultipleDescriptor ref in Preface

2012-10-25 13:56:24 +02:00

mxg.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

ncdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

network.c

Merge commit '4521645b1aee9e9ad8f5cea7b2392cd5f6ffcd26'

2012-10-28 13:19:11 +01:00

network.h

Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

2012-10-24 12:53:26 +02:00

nsvdec.c

nsvdec: fix division by 0

2012-10-20 20:20:39 +02:00

nullenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

nut.c

Merge remote-tracking branch 'qatar/master'

2012-10-30 17:47:36 +01:00

nut.h

Merge commit '381dc1a5ec0925b281c573457c413ae643567086'

2012-10-30 13:52:03 +01:00

nutdec.c

Merge commit '381dc1a5ec0925b281c573457c413ae643567086'

2012-10-30 13:52:03 +01:00

nutenc.c

Merge commit '381dc1a5ec0925b281c573457c413ae643567086'

2012-10-30 13:52:03 +01:00

nuv.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

oggdec.c

Fix various uses of av_log_missing_feature()

2012-10-21 23:13:53 +02:00

oggdec.h

oggdec: add missing () for OGG_NOGRANULE_VALUE

2012-09-25 16:03:55 +02:00

oggenc.c

oggenc: remove unneeded null check.

2012-11-05 00:28:21 +01:00

oggparsecelt.c

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

oggparsedirac.c

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

oggparseflac.c

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

oggparseogm.c

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

oggparseopus.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

oggparseskeleton.c

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

oggparsespeex.c

ogg: check that the expected number of headers had been parsed

2012-09-24 22:35:29 +02:00

oggparsetheora.c

oggparsetheora: fix comment header parsing

2012-10-05 18:07:13 +02:00

oggparsevorbis.c

Merge commit '7751e4693dd10ec98c20fbd9887233b575034272'

2012-09-25 15:15:16 +02:00

oma.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

oma.h

omadec: make sample rate table large enough to prevent out of array reading.

2012-04-16 18:36:39 +02:00

omadec.c

omadec: fix len check in nprobe() prevent out of array access

2012-11-11 18:16:48 +01:00

omaenc.c

lavf: add missing new line to some error messages

2012-09-01 15:59:30 +02:00

options_table.h

lavf: Add support offset timestamps on muxing.

2012-09-26 15:55:16 +02:00

options.c

options: Fix warning about incompatible pointer type

2012-07-30 03:48:46 +02:00

os_support.c

Merge commit '80521c1997a23e148edf89e11b939ab8646297ca'

2012-10-24 12:53:26 +02:00

os_support.h

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

paf.c

paf: avoid C99 overflows

2012-10-14 04:01:41 +02:00

pcm.c

Merge remote-tracking branch 'qatar/master'

2012-02-16 01:34:37 +01:00

pcm.h

Merge remote-tracking branch 'qatar/master'

2012-02-16 01:34:37 +01:00

pcmdec.c

Merge remote-tracking branch 'qatar/master'

2012-10-26 15:20:48 +02:00

pcmenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

pmpdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

psxstr.c

psxstr: more correct array type.

2012-09-01 23:45:32 +02:00

pva.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

qcp.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

qtpalette.h

…

r3d.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rawdec.c

Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

2012-10-26 14:24:57 +02:00

rawdec.h

Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

2012-10-26 14:24:57 +02:00

rawenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rawenc.h

…

rawvideodec.c

Merge commit '1b891d17c531e8a63c2974aab4bf997ce70746f3'

2012-10-26 14:24:57 +02:00

rdt.c

rmdec: pass mime type to ff_rm_read_mdpr_codecdata()

2012-08-21 06:14:29 +02:00

rdt.h

…

realtextdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

riff.c

riff: add SMV2 FourCC for H264

2012-11-10 13:16:14 +01:00

riff.h

Merge commit '71e92414bfd79e56ea6fff174a665ff7b9b86e68'

2012-10-17 14:30:25 +02:00

rl2.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rm.h

Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'

2012-10-16 13:20:46 +02:00

rmdec.c

rmdec: fix null derefercne

2012-10-26 16:18:09 +02:00

rmenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

rmsipr.c

Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'

2012-10-16 13:20:46 +02:00

rmsipr.h

Merge commit '4c995fafd861f537360b3717901cdbed6a6844e7'

2012-10-16 13:20:46 +02:00

rpl.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rso.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rso.h

Merge remote-tracking branch 'qatar/master'

2011-11-03 02:16:26 +01:00

rsodec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rsoenc.c

Merge commit '3f7fd59d151a2773f0e2e93e56b6b13ec6e5334b'

2012-09-16 14:24:11 +02:00

rtmp.h

Merge remote-tracking branch 'qatar/master'

2012-08-15 15:55:24 +02:00

rtmpcrypt.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

rtmpcrypt.h

Merge remote-tracking branch 'qatar/master'

2012-07-23 21:25:09 +02:00

rtmpdh.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

rtmpdh.h

Merge remote-tracking branch 'qatar/master'

2012-07-23 21:25:09 +02:00

rtmphttp.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

rtmppkt.c

Merge remote-tracking branch 'qatar/master'

2012-08-02 23:34:01 +02:00

rtmppkt.h

Merge commit '0c03cc68386443f1e96ab6fb358220faf67cd5ff'

2012-10-24 13:42:58 +02:00

rtmpproto.c

rtmpproto: Use av_strlcat instead of strncat

2012-11-05 21:47:43 +01:00

rtp.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rtp.h

Merge commit '1cd432e167b1a80853760c89a33606e2b5f229c2'

2012-10-19 13:58:14 +02:00

rtpdec_amr.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rtpdec_asf.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rtpdec_formats.h

Merge remote-tracking branch 'qatar/master'

2012-09-27 14:29:03 +02:00

rtpdec_g726.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rtpdec_h263_rfc2190.c

rtpdec: factorize identical code used in several handlers

2012-11-02 07:58:37 +01:00

rtpdec_h263.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rtpdec_h264.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

rtpdec_ilbc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rtpdec_jpeg.c

Merge remote-tracking branch 'qatar/master'

2012-11-02 14:57:36 +01:00

rtpdec_latm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rtpdec_mpeg4.c

Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'

2012-10-10 13:01:27 +02:00

rtpdec_qcelp.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

rtpdec_qdm2.c

rtpdec_qdm2: change one assert to av_assert0

2012-10-13 03:32:37 +02:00

rtpdec_qt.c

Merge commit '0a7005bebd23ade7bb852bce0401af1a8fdbb723'

2012-10-13 15:42:49 +02:00

rtpdec_svq3.c

Merge remote-tracking branch 'qatar/master'

2012-11-02 14:57:36 +01:00

rtpdec_vp8.c

Merge remote-tracking branch 'qatar/master'

2012-11-02 14:57:36 +01:00

rtpdec_xiph.c

Merge remote-tracking branch 'qatar/master'

2012-11-02 14:57:36 +01:00

rtpdec.c

Merge remote-tracking branch 'qatar/master'

2012-11-02 14:57:36 +01:00

rtpdec.h

Merge remote-tracking branch 'qatar/master'

2012-11-02 14:57:36 +01:00

rtpenc_aac.c

Merge remote-tracking branch 'qatar/master'

2012-11-09 10:29:51 +01:00

rtpenc_amr.c

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

rtpenc_chain.c

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

rtpenc_chain.h

Merge remote-tracking branch 'qatar/master'

2012-05-26 22:37:37 +02:00

rtpenc_h263_rfc2190.c

rtpenc: Use MB info side data for splitting H263 packets for RFC 2190

2012-03-01 16:08:32 +02:00

rtpenc_h263.c

Change all uses of restrict to use av_restrict instead.

2012-06-17 00:38:39 +02:00

rtpenc_h264.c

Merge remote-tracking branch 'qatar/master'

2012-06-18 20:07:00 +02:00

rtpenc_jpeg.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

rtpenc_latm.c

…

rtpenc_mpv.c

Merge remote-tracking branch 'qatar/master'

2012-01-29 00:34:59 +01:00

rtpenc_vp8.c

Merge remote-tracking branch 'qatar/master'

2012-10-09 13:06:04 +02:00

rtpenc_xiph.c

rtpenc_xiph: switch to av_assert

2012-08-28 22:29:20 +02:00

rtpenc.c

Merge remote-tracking branch 'qatar/master'

2012-10-09 13:06:04 +02:00

rtpenc.h

Merge remote-tracking branch 'qatar/master'

2012-09-24 13:54:24 +02:00

rtpproto.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

rtsp.c

Merge commit '381dc1a5ec0925b281c573457c413ae643567086'

2012-10-30 13:52:03 +01:00

rtsp.h

Merge commit 'c3e15f7b39aac2012f09ee4ca86d2bc674ffdbd4'

2012-10-22 14:39:12 +02:00

rtspcodes.h

Merge remote-tracking branch 'qatar/master'

2012-07-11 23:57:11 +02:00

rtspdec.c

Merge commit 'f6c38c5f4ed6683a6a61db2ed418a68bbe5f5507'

2012-10-13 14:14:11 +02:00

rtspenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

samidec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

sapdec.c

Merge remote-tracking branch 'qatar/master'

2012-07-30 23:28:31 +02:00

sapenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

sauce.c

…

sauce.h

…

sbgdec.c

sbgdec: dont set slide to a uninitialized value

2012-11-06 21:46:22 +01:00

sctp.c

sctp: silence const warning

2012-11-08 16:06:04 +01:00

sdp.c

sdp: output speex optional vbr parameter

2012-10-13 18:47:18 +02:00

seek-test.c

seek-test: support printing multiple packets

2012-05-04 14:40:22 +02:00

seek.c

Merge remote-tracking branch 'qatar/master'

2012-03-06 06:03:32 +01:00

seek.h

Merge remote-tracking branch 'qatar/master'

2012-03-06 06:03:32 +01:00

segafilm.c

segafilm: fix division by 0

2012-11-11 18:32:46 +01:00

segment.c

segment: fix null ptr deref

2012-11-05 20:26:10 +01:00

sierravmd.c

sierravmd: flip reduce arg order.

2012-10-16 20:03:37 +02:00

siff.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

smacker.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

smjpeg.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

smjpeg.h

Replace Libav with FFmpeg in license headers for files created by me

2012-06-29 01:58:34 +00:00

smjpegdec.c

smjpegdec: set nb_frames for video stream

2012-11-02 16:32:51 +00:00

smjpegenc.c

smjpegenc: use bits_per_coded_sample instead of calling function

2012-11-07 01:31:39 +00:00

smoothstreamingenc.c

smoothstreamingenc: check return value of mkdir()

2012-10-29 03:34:17 +01:00

smush.c

smush: improve probing

2012-11-04 16:50:58 +00:00

sol.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

sox.h

…

soxdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

soxenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

spdif.c

…

spdif.h

…

spdifdec.c

Merge commit '8b8899ac3233b4f7af83ded0dc032fad8902d714'

2012-10-23 15:00:27 +02:00

spdifenc.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

srtdec.c

lavf/srtdec: recognize subtitles starting at event index 0.

2012-11-05 07:37:45 +01:00

srtenc.c

lavf/srtenc: ignore invalid timed packets instead of failing.

2012-11-10 22:43:27 +01:00

subtitles.c

lavf/subtitles: add some SMIL helpers.

2012-06-29 20:20:02 +02:00

subtitles.h

lavf/subtitles: add some SMIL helpers.

2012-06-29 20:20:02 +02:00

subviewerdec.c

lavf/subviewerdec: fix potential timing overflows.

2012-10-21 01:08:17 +02:00

swf.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +02:00

swf.h

lavf/swf: transform the swf tags define in an enum.

2012-10-12 23:15:21 +02:00

swfdec.c

lavf/swfdec: support DefineBitsLossless{,2} tag.

2012-10-17 07:49:17 +02:00

swfenc.c

swfenc: zero fifo after freeing

2012-10-27 23:03:07 +02:00

takdec.c

takdec: fix seeking

2012-10-10 13:09:26 +00:00

tcp.c

tcp: accept params through avio_open2() options

2012-10-09 17:24:55 +02:00

thp.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

tiertexseq.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

tls.c

Merge remote-tracking branch 'qatar/master'

2012-07-29 02:16:26 +02:00

tmv.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

tta.c

tta: datalen is unsigned integer per reference library

2012-10-17 11:58:08 +00:00

tty.c

Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'

2012-09-05 14:33:32 +02:00

txd.c

lavf/txd: cosmetics: fix identation

2012-10-15 08:12:25 +00:00

udp.c

udp: check ff_socket_nonblock() return code

2012-11-05 21:21:04 +01:00

url-test.c

Merge commit 'cbcd497f384f0f8ef3f76f85b29b644b900d6b9f'

2012-10-10 13:01:27 +02:00

url.h

Add 'rw_timeout' into URLContext

2012-08-29 00:05:03 +02:00

urldecode.c

Merge remote-tracking branch 'qatar/master'

2012-07-26 21:37:15 +02:00

urldecode.h

Merge remote-tracking branch 'qatar/master'

2012-07-26 21:37:15 +02:00

utils.c

lavf: Dont compare absolute to relative timestamps in duration gcd

2012-11-09 14:59:43 +01:00

vc1test.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

vc1testenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

version.h

AVR demuxer

2012-11-05 17:31:22 +00:00

voc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

voc.h

Merge remote-tracking branch 'qatar/master'

2012-02-16 01:34:37 +01:00

vocdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

vocenc.c

vocenc: fix 10l regression

2012-11-04 04:46:10 +00:00

vorbiscomment.c

…

vorbiscomment.h

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

vqf.c

vqf: check samplerate, avoid division by 0.

2012-11-09 18:05:19 +01:00

wavdec.c

Merge remote-tracking branch 'qatar/master'

2012-10-17 15:53:42 +02:00

wavenc.c

wavenc: fix curruption of metadata

2012-10-30 21:48:39 +01:00

wc3movie.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

webvttdec.c

lavf/webvttdec: fix potential timing overflows.

2012-10-21 01:16:49 +02:00

westwood_aud.c

westwood_aud: remove stale comment

2012-11-03 14:54:17 +00:00

westwood_vqa.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

wtv.c

wtv: move duplicated guids into wtv.c

2012-11-06 15:52:33 +01:00

wtv.h

wtv: move duplicated guids into wtv.c

2012-11-06 15:52:33 +01:00

wtvdec.c

wtv: move duplicated guids into wtv.c

2012-11-06 15:52:33 +01:00

wtvenc.c

wtvenc: produce seekable files

2012-11-07 13:59:03 +01:00

wv.c

Merge commit '97bf7c03b1338a867da52c159a2afecbdedcfa88'

2012-11-12 11:32:11 +01:00

wvenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

xa.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

xmv.c

xmv: Fix integer overflow

2012-11-09 17:18:01 +01:00

xwma.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02:00

yop.c

yop: check return value of avformat_new_stream()

2012-10-12 14:25:00 +00:00

yuv4mpeg.c

Add yuv4xxp12 and yuv4xxp14 pixel formats to y4m encoder and decoder.

2012-11-10 02:19:55 +01:00