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

* qatar/master:
  mpegvideo_enc: don't use deprecated avcodec_encode_video().
  cmdutils: refactor -codecs option.
  avconv: make -shortest a per-output file option.
  lavc: add avcodec_descriptor_get_by_name().
  lavc: add const to AVCodec* function parameters.
  swf(dec): replace CODEC_ID with AV_CODEC_ID
  dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
  rtmpdh: Do not generate the same private key every time when using libnettle
  rtp: remove ff_rtp_get_rtcp_file_handle().
  rtsp.c: use ffurl_get_multi_file_handle() instead of ff_rtp_get_rtcp_file_handle()
  avio: add (ff)url_get_multi_file_handle() for getting more than one fd
  h264: vdpau: fix crash with unsupported colorspace
  amrwbdec: Decode the fr_quality bit properly

Conflicts:
	Changelog
	cmdutils.c
	cmdutils_common_opts.h
	doc/ffmpeg.texi
	ffmpeg.c
	ffmpeg.h
	ffmpeg_opt.c
	libavcodec/h264.c
	libavcodec/options.c
	libavcodec/utils.c

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

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

..

4xm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

a64.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

aacdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

ac3dec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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 '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

aiff.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

aiffdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

aiffenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

allformats.c

Add ICO muxer

2012-08-14 16:54:25 +02: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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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

…

asf.h

…

asfcrypt.c

…

asfcrypt.h

…

asfdec.c

asfdec: ignore too tiny indexes

2012-08-14 03:21:08 +02:00

asfenc.c

Merge remote-tracking branch 'qatar/master'

2012-08-11 15:01:45 +02:00

assdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

assenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

au.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

audiointerleave.c

…

audiointerleave.h

…

avc.c

…

avc.h

…

avformat.h

avformat: export queue_attached_pictures

2012-08-16 04:37:55 +02:00

avi.h

…

avidec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

avienc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

avio_internal.h

…

avio.c

Merge remote-tracking branch 'qatar/master'

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

avio.h

lavf/avio: flush internal buffer when calling avio_close()

2012-08-18 11:21:44 +02:00

aviobuf.c

lavf/avio: flush internal buffer when calling avio_close()

2012-08-18 11:21:44 +02:00

avisynth.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

avlanguage.c

…

avlanguage.h

…

avs.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

bethsoftvid.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

bfi.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

bink.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

bintext.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

bit.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

bluray.c

…

bmv.c

Replace all CODEC_ID_* with AV_CODEC_ID_*

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

c93.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

cache.c

…

caf.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

caf.h

…

cafdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

cafenc.c

rename missed CodecID to AVCodecID

2012-08-07 23:57:21 +02: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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

concat.c

…

crcenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

crypto.c

…

cutils.c

…

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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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

dv.c

dv: fix null ptr dereference

2012-08-16 04:25:07 +02:00

dv.h

…

dvenc.c

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

ffm.h

…

ffmdec.c

Merge remote-tracking branch 'qatar/master'

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

ffmenc.c

ffmenc: switch to av_assert

2012-08-18 05:02:58 +02:00

ffmeta.h

…

ffmetadec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

ffmetaenc.c

Merge remote-tracking branch 'qatar/master'

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

file.c

lavf/file: cosmetic: Use "not" instead of "equals zero"

2012-07-05 10:55:49 +02:00

filmstripdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

filmstripenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

flacdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

flacenc_header.c

…

flacenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

flacenc.h

…

flic.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

flv.h

Merge remote-tracking branch 'qatar/master'

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

flvdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

flvenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

framecrcenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

framehash.c

…

g723_1.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

g729dec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

gif.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

gopher.c

…

gsmdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

gxf.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

gxf.h

…

gxfenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

h261dec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

h263dec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

h264dec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

hls.c

hls: Initialize stream_offset before find_stream_info.

2012-08-13 20:37:52 +02:00

hlsproto.c

cosmetics: various spelling fixes

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

http.c

http: try to detect live akamai streams and dont enable seeking for them

2012-06-28 00:18:24 +02:00

http.h

cosmetics: various spelling fixes

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

httpauth.c

Merge remote-tracking branch 'qatar/master'

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

httpauth.h

…

icodec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

icoenc.c

Add ICO muxer

2012-08-14 16:54:25 +02:00

id3v1.c

…

id3v1.h

…

id3v2.c

Merge remote-tracking branch 'qatar/master'

2012-08-12 13:43:03 +02: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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02: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

iff: replace av_abort by av_assert0

2012-08-10 16:26:39 +02:00

ilbc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

img2.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

img2dec.c

lavf/img2dec: add and document pattern_type option

2012-08-08 23:43:36 +02:00

img2enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

ingenientdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

internal.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

ipmovie.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

isom.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

isom.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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 '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

libavformat.v

FireWire DV/HDV input device using libiec61883

2012-07-05 13:02:49 +02:00

libmodplug.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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

lxfdec.c

Support reading 16-channel lxf files.

2012-08-16 10:20:25 +02:00

m4vdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

Makefile

Add ICO muxer

2012-08-14 16:54:25 +02:00

matroska.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

matroska.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

matroskadec.c

matroskadec: fix lace vs block duration.

2012-08-08 17:54:49 +02:00

matroskaenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

md5enc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

md5proto.c

…

metadata.c

…

metadata.h

…

mgsts.c

…

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

…

mmsh.c

…

mmst.c

Merge remote-tracking branch 'qatar/master'

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

mov_chan.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mov_chan.h

Replace all CODEC_ID_* with AV_CODEC_ID_*

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

mov.c

movdec: Try to recover from overreading atoms

2012-08-15 03:21:19 +02:00

movenc.c

lavf/movenc: use two explicit bytes instead of a short.

2012-08-08 23:13:52 +02:00

movenc.h

movenc: Handle need for extra packets to express subtitle duration.

2012-08-04 12:01:24 -07:00

movenchint.c

…

mp3dec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mp3enc.c

mp3enc: fix CODEC_ID/CodecID that leaked in from older patch

2012-08-11 01:52:15 +02:00

mpc8.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mpc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mpeg.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mpeg.h

…

mpegenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mpegts.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mpegts.h

…

mpegtsenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mpegvideodec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mpjpeg.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

msnwc_tcp.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mtv.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mvi.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mxf.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mxf.h

mxfdec: fix frame height vs field height confusion

2012-07-10 13:51:04 +02:00

mxfdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

mxfenc.c

lavf/mxfenc: better error handling with invalid frame rate.

2012-08-08 09:11:25 +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 remote-tracking branch 'qatar/master'

2012-08-16 16:20:30 +02:00

network.h

Merge remote-tracking branch 'qatar/master'

2012-07-16 20:45:41 +02:00

nsvdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

nullenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

nut.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

nut.h

…

nutdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

nutenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

nuv.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oggdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oggdec.h

oggdec: add support for Opus codec.

2012-07-20 11:16:52 +02:00

oggenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oggparsecelt.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oggparsedirac.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oggparseflac.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oggparseogm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oggparseopus.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oggparseskeleton.c

…

oggparsespeex.c

Replace all CODEC_ID_* with AV_CODEC_ID_*

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

oggparsetheora.c

oggparsetheora: fix metadata parsing

2012-08-12 23:09:45 +02:00

oggparsevorbis.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oma.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

oma.h

…

omadec.c

omadec: switch to AVSTREAM_PARSE_FULL_RAW

2012-07-26 03:30:35 +02:00

omaenc.c

Replace all CODEC_ID_* with AV_CODEC_ID_*

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

options_table.h

Merge commit 'fe1c1198e670242f3cf9e3e1eef27cff77f3ee23'

2012-07-29 23:04:49 +02:00

options.c

options: Fix warning about incompatible pointer type

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

os_support.c

Merge remote-tracking branch 'qatar/master'

2012-07-18 22:34:48 +02:00

os_support.h

Merge remote-tracking branch 'qatar/master'

2012-06-30 22:44:18 +02:00

paf.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

pcm.c

…

pcm.h

…

pcmdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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 '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rawdec.h

…

rawenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rawenc.h

…

rawvideodec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rdt.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rdt.h

…

realtextdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

riff.c

riffenc: fix aac

2012-08-13 01:41:55 +02:00

riff.h

rename missed CodecID to AVCodecID

2012-08-07 23:57:21 +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

…

rmdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rmenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45: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

…

rsodec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rsoenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtmp.h

Merge remote-tracking branch 'qatar/master'

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

rtmpcrypt.c

Merge remote-tracking branch 'qatar/master'

2012-07-24 21:15:57 +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 remote-tracking branch 'qatar/master'

2012-07-18 01:27:19 +02:00

rtmppkt.c

Merge remote-tracking branch 'qatar/master'

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

rtmppkt.h

Merge remote-tracking branch 'qatar/master'

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

rtmpproto.c

Merge remote-tracking branch 'qatar/master'

2012-08-17 17:06:52 +02:00

rtp.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtp.h

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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-06-19 20:53:27 +02:00

rtpdec_g726.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_h263_rfc2190.c

Replace all CODEC_ID_* with AV_CODEC_ID_*

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

rtpdec_h263.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_h264.c

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

rtpdec_ilbc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_latm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_mpeg4.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_qcelp.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_qdm2.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_qt.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_svq3.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_vp8.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec_xiph.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

rtpdec.h

Merge remote-tracking branch 'qatar/master'

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

rtpenc_aac.c

…

rtpenc_amr.c

…

rtpenc_chain.c

…

rtpenc_chain.h

…

rtpenc_h263_rfc2190.c

…

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_latm.c

…

rtpenc_mpv.c

…

rtpenc_vp8.c

…

rtpenc_xiph.c

…

rtpenc.c

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

rtpenc.h

Merge remote-tracking branch 'qatar/master'

2012-07-22 05:05:02 +02:00

rtpproto.c

Merge remote-tracking branch 'qatar/master'

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

rtsp.c

Merge remote-tracking branch 'qatar/master'

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

rtsp.h

Merge remote-tracking branch 'qatar/master'

2012-08-09 19:31:56 +02:00

rtspcodes.h

Merge remote-tracking branch 'qatar/master'

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

rtspdec.c

Merge remote-tracking branch 'qatar/master'

2012-07-30 23:28:31 +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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

sctp.c

sctp: add port missing error message

2012-07-25 20:31:16 +03:00

sdp.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

seek-test.c

…

seek.c

…

seek.h

…

segafilm.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

segment.c

lavf/segment: change default value for segment_list_size option, from 5 to 0

2012-08-18 12:32:23 +02:00

sierravmd.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

siff.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

smacker.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +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

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

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

smjpegenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

smush.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02: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 '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

spdifenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

srtdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

srtenc.c

srtenc: Add timing-less "subrip" encoder.

2012-08-15 20:46:54 -07: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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

swf.c

Merge remote-tracking branch 'qatar/master'

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

swf.h

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +02:00

swfdec.c

Merge remote-tracking branch 'qatar/master'

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

swfenc.c

Merge remote-tracking branch 'qatar/master'

2012-08-10 16:25:23 +02:00

tcp.c

Merge remote-tracking branch 'qatar/master'

2012-07-25 22:00:06 +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 '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

tta.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

tty.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

txd.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

udp.c

udp: do not call pthread_{mutex,cond}_destroy when not initialized.

2012-08-06 10:06:26 +02:00

url.h

Merge remote-tracking branch 'qatar/master'

2012-08-18 15:20:32 +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

avformat: export queue_attached_pictures

2012-08-16 04:37:55 +02: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

lavf/segment: change default value for segment_list_size option, from 5 to 0

2012-08-18 12:32:23 +02:00

voc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

voc.h

…

vocdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

vocenc.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

vorbiscomment.c

…

vorbiscomment.h

…

vqf.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

wav.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

wc3movie.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

westwood_aud.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

westwood_vqa.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

wtv.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

wtv.h

…

wtvdec.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

wtvenc.c

rename missed CodecID to AVCodecID

2012-08-07 23:57:21 +02:00

wv.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

2012-08-07 22:45:46 +02: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

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

xwma.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

yop.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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

yuv4mpeg.c

Merge commit '36ef5369ee9b336febc2c270f8718cec4476cb85'

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