Michael Niedermayer 45a73d2b47 Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' ...

* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
  swscale: ppc: Remove commented-out define cruft
  nsvdec: Remove commented-out debug cruft
  cpu: Restructure code to avoid pointless ret variable indirection

Conflicts:
	libavutil/cpu.c

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

2013-06-03 11:53:05 +02:00

..

4xm.c

…

a64.c

…

aacdec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

ac3dec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

act.c

…

adp.c

ADP demuxer

2013-05-10 16:10:52 -03:00

adtsenc.c

…

adxdec.c

…

aea.c

…

afc.c

…

aiff.h

…

aiffdec.c

…

aiffenc.c

…

allformats.c

lavf/allformats: align nit for tee muxer.

2013-06-01 02:36:07 +02:00

amr.c

…

anm.c

…

apc.c

…

ape.c

…

apetag.c

apetag: do not create invalid APE tags

2013-05-29 14:01:15 +00:00

apetag.h

Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'

2013-05-29 10:40:42 +02:00

aqtitledec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

asf.c

…

asf.h

…

asfcrypt.c

…

asfcrypt.h

…

asfdec.c

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

2013-05-16 09:56:43 +02:00

asfenc.c

…

assdec.c

…

assenc.c

…

ast.c

…

ast.h

…

astdec.c

…

astenc.c

…

au.c

…

audiointerleave.c

…

audiointerleave.h

…

avc.c

…

avc.h

…

avformat.h

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

avi.h

…

avidec.c

avidec: dont randomly skip packets for offseting the index

2013-05-17 22:16:10 +02:00

avienc.c

avienc: Disallow the first frame to be skiped

2013-05-22 14:11:42 +02:00

avio_internal.h

…

avio.c

…

avio.h

…

aviobuf.c

…

avisynth.c

…

avlanguage.c

…

avlanguage.h

…

avr.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

avs.c

Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

2013-05-05 12:41:36 +02:00

bethsoftvid.c

…

bfi.c

…

bink.c

…

bintext.c

…

bit.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

bluray.c

…

bmv.c

…

boadec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

brstm.c

…

c93.c

…

cache.c

…

caf.c

…

caf.h

…

cafdec.c

…

cafenc.c

…

cavsvideodec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

cdg.c

…

cdxl.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

concat.c

…

concatdec.c

lavf/concat: reject empty scripts.

2013-05-15 16:53:35 +02:00

crcenc.c

…

crypto.c

…

cutils.c

…

data_uri.c

…

daud.c

…

dfa.c

…

diracdec.c

…

dnxhddec.c

…

dsicin.c

…

dtsdec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

dtshddec.c

…

dv.c

…

dv.h

…

dvenc.c

…

dxa.c

…

eacdata.c

…

electronicarts.c

…

epafdec.c

…

ffm.h

…

ffmdec.c

…

ffmenc.c

…

ffmeta.h

…

ffmetadec.c

…

ffmetaenc.c

…

file.c

…

filmstripdec.c

…

filmstripenc.c

…

flacdec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

flacenc_header.c

…

flacenc.c

lavf/flacenc: use ffio_fill()

2013-05-29 10:40:13 +00:00

flacenc.h

…

flic.c

Reduce probing score for flic animation files.

2013-05-15 11:20:39 +02:00

flv.h

…

flvdec.c

…

flvenc.c

…

framecrcenc.c

…

framehash.c

…

frmdec.c

…

ftp.c

ftp: enhanced error handling

2013-05-31 16:54:03 +02:00

g722.c

…

g723_1.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

g729dec.c

…

gif.c

avformat/gif: remove unneeded doxygen comment

2013-05-24 15:36:54 +02:00

gifdec.c

…

gopher.c

…

gsmdec.c

…

gxf.c

…

gxf.h

…

gxfenc.c

…

h261dec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

h263dec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

h264dec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

hls.c

…

hlsenc.c

…

hlsproto.c

…

http.c

…

http.h

…

httpauth.c

…

httpauth.h

…

icodec.c

…

icoenc.c

…

id3v1.c

…

id3v1.h

…

id3v2.c

id3v2: stop ignoring text encoding for chapter titles

2013-05-06 00:54:13 +00:00

id3v2.h

…

id3v2enc.c

lavf/id3v2enc: fix cover art display on some software

2013-05-30 21:16:57 +00:00

idcin.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

idroqdec.c

…

idroqenc.c

…

iff.c

…

ilbc.c

…

img2.c

…

img2dec.c

img2dec: support seeking with ts_from_file

2013-05-25 12:06:14 +02:00

img2enc.c

lavf/img2enc: use FF_CEIL_RSHIFT().

2013-05-16 23:20:07 +02:00

ingenientdec.c

…

internal.h

…

ipmovie.c

…

ircam.c

…

ircam.h

…

ircamdec.c

…

ircamenc.c

…

isom.c

Merge commit '1232a1647ab27e024a3baf4d01d40c8d08d6ced9'

2013-05-17 10:38:08 +02:00

isom.h

avformat/mov: Rename alt_sample_size so its name matches what it is

2013-05-25 18:47:36 +02:00

iss.c

…

iv8.c

…

ivfdec.c

…

ivfenc.c

…

jacosubdec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

jacosubenc.c

…

jvdec.c

avformat/jvdec: fix doxygen comments

2013-05-24 15:36:54 +02:00

latmenc.c

…

libavformat.v

…

libmodplug.c

libmodplug: fix sz type

2013-05-17 14:19:18 +00:00

libnut.c

…

libquvi.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

librtmp.c

…

lmlm4.c

…

loasdec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

log2_tab.c

…

lvfdec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

lxfdec.c

…

m4vdec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

Makefile

Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'

2013-05-29 10:40:42 +02:00

matroska.c

…

matroska.h

Merge commit '564b7e0c0095768cd20001b28154d69462be54e7'

2013-05-28 08:04:02 +02:00

matroskadec.c

Merge remote-tracking branch 'qatar/master'

2013-05-28 11:58:46 +02:00

matroskaenc.c

Merge commit '2d2d6a4883479403798f4ed46941d5b365823570'

2013-05-29 10:40:42 +02:00

md5enc.c

framemd5_class and md5enc_class may not be identical.

2013-05-24 16:28:25 +02:00

md5proto.c

…

metadata.c

…

metadata.h

…

mgsts.c

…

microdvddec.c

…

microdvdenc.c

…

mkvtimestamp_v2.c

…

mm.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

mmf.c

Merge commit '7cbc4cb4424430586ce2d5c0dba81174c6d1db01'

2013-05-15 10:15:15 +02:00

mms.c

…

mms.h

…

mmsh.c

…

mmst.c

…

mov_chan.c

…

mov_chan.h

…

mov.c

avformat/mov: Try to detect and support files with invalid sample sizes

2013-05-30 00:32:36 +02:00

movenc.c

movenc: add video_track_timescale option

2013-05-18 16:42:36 +02:00

movenc.h

movenc: add video_track_timescale option

2013-05-18 16:42:36 +02:00

movenchint.c

…

mp3dec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

mp3enc.c

…

mpc8.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

mpc.c

…

mpeg.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

mpeg.h

…

mpegenc.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

mpegts.c

…

mpegts.h

…

mpegtsenc.c

…

mpegvideodec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

mpjpeg.c

…

mpl2dec.c

…

mpsubdec.c

lavf/mpsub: remove sscanf from probing.

2013-05-06 22:50:59 +02:00

msnwc_tcp.c

…

mtv.c

avformat/mtv: remove empty comments

2013-05-23 14:46:01 +02:00

mux.c

Adding support for encoding VP8 Alpha

2013-05-17 15:11:23 +02:00

mvdec.c

…

mvi.c

…

mxf.c

…

mxf.h

…

mxfdec.c

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

2013-05-16 09:56:43 +02:00

mxfenc.c

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

2013-05-16 09:56:43 +02:00

mxg.c

…

ncdec.c

…

network.c

Merge remote-tracking branch 'qatar/master'

2013-06-02 11:02:02 +02:00

network.h

Merge remote-tracking branch 'qatar/master'

2013-06-02 11:02:02 +02:00

nistspheredec.c

…

noproxy-test.c

…

nsvdec.c

Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'

2013-06-03 11:53:05 +02:00

nullenc.c

…

nut.c

Merge commit '72e228b274a98af1aba9588415d0cd87fde44663'

2013-05-05 11:19:12 +02:00

nut.h

Merge commit 'd46c588f3cb1963a00e990ceaf4ba9ffa05a716d'

2013-05-16 09:11:04 +02:00

nutdec.c

Merge commit 'e0c53c3408181d2e7d544eb65fc7355a79438dfe'

2013-05-08 12:47:54 +02:00

nutenc.c

Merge commit '46c1917350f58dfab84e41919e6c02d43950db8c'

2013-05-06 10:41:43 +02:00

nuv.c

…

oggdec.c

…

oggdec.h

…

oggenc.c

…

oggparsecelt.c

…

oggparsedirac.c

…

oggparseflac.c

…

oggparseogm.c

…

oggparseopus.c

…

oggparseskeleton.c

…

oggparsespeex.c

…

oggparsetheora.c

…

oggparsevorbis.c

…

oma.c

…

oma.h

…

omadec.c

Merge commit 'db9aee6ccf183508835acc325f5ad87d595eacc4'

2013-05-08 13:41:45 +02:00

omaenc.c

…

options_table.h

…

options.c

…

os_support.c

…

os_support.h

…

paf.c

…

pcm.c

…

pcm.h

…

pcmdec.c

…

pcmenc.c

…

pjsdec.c

…

pmpdec.c

…

psxstr.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

pva.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

pvfdec.c

…

qcp.c

…

qtpalette.h

…

r3d.c

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

2013-05-16 09:56:43 +02:00

rawdec.c

…

rawdec.h

…

rawenc.c

…

rawenc.h

…

rawvideodec.c

…

rdt.c

…

rdt.h

…

realtextdec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

redspark.c

redspark: fix memleak in redspark_read_header

2013-05-12 12:14:33 +00:00

riff.c

…

riff.h

…

rl2.c

…

rm.c

…

rm.h

…

rmdec.c

…

rmenc.c

…

rmsipr.c

…

rmsipr.h

…

rpl.c

Escape 130 (RPL) decoder

2013-05-18 07:12:56 +02:00

rsd.c

ADPCM IMA Radical decoder

2013-05-10 16:53:50 -03:00

rso.c

…

rso.h

…

rsodec.c

…

rsoenc.c

…

rtmp.h

Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'

2013-06-02 10:30:35 +02:00

rtmpcrypt.c

…

rtmpcrypt.h

…

rtmpdh.c

…

rtmpdh.h

…

rtmphttp.c

…

rtmppkt.c

Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'

2013-06-02 10:30:35 +02:00

rtmppkt.h

Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'

2013-06-02 10:30:35 +02:00

rtmpproto.c

Merge commit '28306e6d620c109ddd672f7243adfbc2bbb3b18f'

2013-06-02 10:30:35 +02:00

rtp.c

…

rtp.h

…

rtpdec_amr.c

…

rtpdec_asf.c

…

rtpdec_formats.h

…

rtpdec_g726.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

rtpdec_h263_rfc2190.c

avformat: Add av_cold attributes to init functions missing them

2013-05-05 18:33:04 +02:00

rtpdec_h263.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

rtpdec_h264.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

rtpdec_ilbc.c

…

rtpdec_jpeg.c

…

rtpdec_latm.c

…

rtpdec_mpeg4.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

rtpdec_mpeg12.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

rtpdec_mpegts.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

rtpdec_qcelp.c

…

rtpdec_qdm2.c

…

rtpdec_qt.c

…

rtpdec_svq3.c

…

rtpdec_vp8.c

…

rtpdec_xiph.c

Merge commit '7abd35a1ffaecfd79fa07b801621ee11ab595c43'

2013-05-06 10:19:56 +02:00

rtpdec.c

…

rtpdec.h

…

rtpenc_aac.c

…

rtpenc_amr.c

…

rtpenc_chain.c

…

rtpenc_chain.h

…

rtpenc_h263_rfc2190.c

…

rtpenc_h263.c

…

rtpenc_h264.c

…

rtpenc_jpeg.c

…

rtpenc_latm.c

…

rtpenc_mpv.c

…

rtpenc_vp8.c

…

rtpenc_xiph.c

…

rtpenc.c

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

2013-05-16 09:56:43 +02:00

rtpenc.h

…

rtpproto.c

…

rtsp.c

Merge commit 'b3ea76624ad1baab0b6bcc13f3f856be2f958110'

2013-05-16 09:56:43 +02:00

rtsp.h

…

rtspcodes.h

…

rtspdec.c

…

rtspenc.c

…

samidec.c

…

sapdec.c

…

sapenc.c

…

sauce.c

…

sauce.h

…

sbgdec.c

…

sctp.c

Merge commit 'c0c2b96c136ec2cbfd808eefc26de399f447d62f'

2013-05-05 12:41:36 +02:00

sdp.c

…

seek-test.c

seek-test: make duration user configurable

2013-05-21 18:13:25 +02:00

seek.c

…

seek.h

…

segafilm.c

…

segment.c

…

sierravmd.c

Cosmetics: Reindent Sierra vmd demuxer after last commit.

2013-05-05 19:56:46 +02:00

siff.c

…

smacker.c

Merge remote-tracking branch 'qatar/master'

2013-05-28 11:58:46 +02:00

smjpeg.c

…

smjpeg.h

…

smjpegdec.c

…

smjpegenc.c

…

smoothstreamingenc.c

…

smush.c

…

sol.c

…

sox.h

…

soxdec.c

…

soxenc.c

…

spdif.c

…

spdif.h

…

spdifdec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

spdifenc.c

…

srtdec.c

avformat/srtdec: Fix pointer corruption

2013-05-14 16:38:33 +02:00

srtenc.c

…

srtp.c

…

srtp.h

…

srtpproto.c

…

subtitles.c

…

subtitles.h

…

subviewer1dec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

subviewerdec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

swf.c

…

swf.h

lavf/swf: remove unused assert include.

2013-05-26 15:48:50 +02:00

swfdec.c

…

swfenc.c

…

takdec.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

tcp.c

Merge remote-tracking branch 'qatar/master'

2013-06-02 11:02:02 +02:00

tedcaptionsdec.c

avformat: replace "AVPROBE_SCORE_MAX / X" by AVPROBE_SCORE_EXTENSION / Y

2013-05-05 13:34:56 +02:00

tee.c

…

thp.c

…

tiertexseq.c

…

tls.c

…

tmv.c

…

tta.c

lavf/tta: check header and seek table checksum

2013-05-31 21:10:57 +00:00

tty.c

…

txd.c

…

udp.c

…

url-test.c

…

url.h

…

urldecode.c

…

urldecode.h

…

utils.c

Merge commit 'c330eba84cf2370ad72423aa9e410e20afdc52e2'

2013-05-28 09:51:19 +02:00

vc1test.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

vc1testenc.c

…

version.h

lavf/id3v2enc: fix cover art display on some software

2013-05-30 21:16:57 +00:00

vivo.c

…

voc.c

…

voc.h

…

vocdec.c

…

vocenc.c

…

vorbiscomment.c

…

vorbiscomment.h

…

vplayerdec.c

…

vqf.c

avformat/vqf: check number of channels before use.

2013-05-07 22:26:56 +02:00

w64.c

…

w64.h

…

wavdec.c

Support playing SMV files.

2013-05-22 15:20:22 +02:00

wavenc.c

…

wc3movie.c

…

webvttdec.c

lavf/webvttdec: factorize identifier and settings side data code.

2013-06-01 15:12:49 +02:00

westwood_aud.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

westwood_vqa.c

…

wtv.c

…

wtv.h

…

wtvdec.c

avformat/wtvdec: fix doxygen comments

2013-05-24 15:36:54 +02:00

wtvenc.c

wtvenc: use ffio_fill()

2013-05-29 18:14:43 +00:00

wv.c

Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'

2013-05-29 10:07:30 +02:00

wv.h

Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'

2013-05-29 10:07:30 +02:00

wvdec.c

Merge commit '794ca87d2bff2513118de8b97595b3e23070e67d'

2013-05-29 10:07:30 +02:00

wvenc.c

use Kostyas full name in copyrights

2013-06-02 11:25:56 +02:00

xa.c

Merge commit 'e0f8be6413b6a8d334d6052e610af32935c310af'

2013-05-05 12:31:03 +02:00

xmv.c

…

xwma.c

…

yop.c

…

yuv4mpeg.c

…