Force aix strip to work on 32 and 64 bit by default.

avcodec/h264: fix frame skip code

Fixes Ticket3475

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

avcodec/h264_slice: support skipping loop filtering for non key frames

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

avcodec/h264: use the correct level for droping non intra frames

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

Merge commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb'

* commit '83aa4fc3feec7389ac781fece1e994f2dfd7ebdb':
  configure: Directly support Android as target OS

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

Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'

* commit '766f2d965ff1948749c37f26a714adb8aa89c4a9':
  gitignore: add dylib and swp entries

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

Merge commit '711aa2a82727907f778fb8aa9a93aff2120170f2'

* commit '711aa2a82727907f778fb8aa9a93aff2120170f2':
  lavf: dump stream side data when probing

Conflicts:
libavformat/dump.c

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

avformat/dump: put copyright back from the file from which dump.c was split out

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

Merge commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb'

* commit '2dc265619a2fc9c6f9aff7ac2bcdbcb90e9610cb':
  lavf: group dump functions together

Conflicts:
libavformat/utils.c

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

Merge commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f'

* commit '5a69ded12aaf2bd3baed5d1d644ef23cfecef87f':
  vf_showinfo: print display transformation values

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

configure: Directly support Android as target OS

gitignore: add dylib and swp entries

Add nointra AVDiscard level

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

Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Do not suggest to use gas-preprocessor on aix where it doesn't work.

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

swr: reindent.

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

avcodec/huffyuvdec: Fix fill value for truncated bitstreams

Found-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Do not suggest to use gas-preprocessor on aix where it doesn't work.

huffyuvdec: use unsafe bitstream reader

The reader reads in chunks of 11 bits at most, and at most 3 times. The unsafe
reader therefore may read 6 chunks instead of 1 in worst case, ie 8 bytes,
which is within the padding tolerance.

The reader ends up being ~10% faster. Cumulative effect of unsafe reading and
code block swapping on 3 sequences is for 1 thread, decoding time goes from
23.3s to 19.0s.

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

huffyuv: fate: add a BGR24 test

It was previously untested.

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

hevc: Fix 4K sample video

Reviewed-by: smarter
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/smoothstreamingenc: Use av_mallocz_array()

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

Fix compilation on ppc64 and ppc with pic if gas-preprocessor is installed.

avcodec/dvbsubdec: Split save_subtitle_set() out

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

avcodec/dvbsubdec: add AVClass to context

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

avcodec/dvbsubdec: restructure version check

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

avformat/framecrcenc: print the checksum and size of extradata as well

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

huffyuvdec: remove somewhat deprecated code

The old code was reserving the 0xFFFF entry to represent an inexisting
entry/codeword. These entries are now detected through their length
being <= 0. As this entry is often used for the residuals (-1,-1), which
should be among the most frequent, it is particularly important to not
reserve it.

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

MAINTAINERS: Add Co maintainer for huffyuv*, rv4*, vc1*

Patch by: Christophe Gisquet
Commit Message by commiter

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

avcodec/huffyuvdec: assume vlcs can be 32 instead of 31 bits max

This should avoid a division as well

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

huffyuvdec: swap code blocks

The effect is not really deterministic, as it seems to be a combination
on x86_64 of fewer registers used, different jump offsets and, for all
archs, of likely branches.

Speedup is around 15%.

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

swr: compile mmx2 s16p functions only on x86-32.

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

x86util: add and use RSHIFT/LSHIFT macros

Those macros take a byte number as shift argument, as this argument
differs between MMX and SSE2 instructions.

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

fate: yadif: add >8 bit tests

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

aandcttab: fix spelling

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

avcodec/xbmdec: remove dependancy on zero padding on input packet

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

avcodec/indeo5: Fix infinite loop in skip_hdr_extension()

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

swr: add prototypes for resample dsp functions

Should fix compilation failures with MSVC and any other compiler
without inline asm support.

Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avformat/mpc: attempt to allocate a packet that is not smaller than the data inside it

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

swr: remove obsolete function prototypes.

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

ffmpeg: for h264 we need has_b_frames from the decoder

Other solutions welcome

Fixes Ticket3711

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

ffmpeg: print values of mismatching has_b_frames

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

cmdutils: implement FFREPORT=level=...

Fixes Ticket3057

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

doc/filters: remove double quotes from zoompan example

Based on suggested change by Clément Bœsch.

Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/ppc/idct_altivec: add plain idct()

Tested-by: Carl Eugen Hoyos <cehoyos@ag.or.at>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swr: split out DSP functions.

DSP bits of swri_resample go into their own mini-DSP functions; DSP
init goes from a per-call branch in multiple_resample to a proper
DSP init routine; x86 bits go into x86/; swri_resample() moves out of
resample_template.c into resample.c because it's independent of DSP
code or sample type; multiple_resample() is simplified.

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

mpeg12enc: add seq_disp_ext option for deciding when to write a sequence_display_extension

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

mpeg12enc: add support for PANSCAN side data in sequence_display_extension

Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fix compilation with --disable-everything --enable-parser=vc1.

avcodec/vc1dec: Fix support for small widths/linesizes

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

swresample/resample: replace assert by av_assert

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

Fix standalone compilation of the H264 decoder on ppc.

swr: handle initial negative sample index outside DSP function.

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

fate/aic: force simple idct

This should ensure all platforms use the same idct

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

MAINTAINERS: add my (Timothy Gu's) PGP fingerprint and my name for fateserver

Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

lavf: dump stream side data when probing

lavf: group dump functions together

vf_showinfo: print display transformation values

swr: remove unnecessary assignment.

I don't see dst_incr/dst_incr_frac ever being changed from their
initial value (which is the inverse of this operation), so it seems
to me that this is a no-op.

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

avfilter/af_asetnsamples: fix pts handling when timebase and 1/samplerate differ

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

ffmpeg: Fix bitstream filters manipulating AVCodecContext

Fixes Ticket3715

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

avfilter/formats: Use av_realloc_array()

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

avfilter/vf_dejudder: Use av_mallocz_array()

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

avfilter/vf_unsharp: use av_malloc_array()

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

avcodec/svq1enc: fix encoding of small widths

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

vfilter/avf_showcqt: fix 'mixed declarations and code'

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

Merge commit '27631796c9d1b8146ad4a16e6539ecc08afa7565'

* commit '27631796c9d1b8146ad4a16e6539ecc08afa7565':
  ac3: Only initialize float_dsp for the float encoder variant

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

Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'

* commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b':
  Rename tpel_template.c ---> pel_template.c

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

avcodec/mpegvideo: check that linesize is not too small

Note linesize is rounded up to at least a multiple of 8

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

avcodec/rv34: fix edge emu with uv stride <= 25

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

MAINTAINERS: Added Tim Nicholson's key fingerprint

Signed-off-by: Tim.Nicholson <tim.nicholson@bbc.co.uk>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

swscale: Allow the max filter size to be set at compile time

This can help "extreme" resizes, e.g with some 4k stuff.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

ac3: Only initialize float_dsp for the float encoder variant

Rename tpel_template.c ---> pel_template.c

The new name more accurately describes what the file is about.

avcodec/mpegvideo: Fix psnr calculation with slice threads

This fixes a race condition and use of the wrong field, which become shared
instead of per thread during some AVFrame changes.

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

libavcodec/wmv2: remove dead code

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

Merge commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92'

* commit '4321e507564b2d8a5dfc630f8d6fefba6fdc1e92':
  configure: use pkg-config for libx264

Not merged as requested by carl
a patch to fix this has been posted by carl to ffmpeg-devel

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

avcodec/mpegvideo: fix edge emulation with uvlinesize below 25

Fixes fate-vsynth3-wmv2

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

lavd/avfoundation: Support user selected pixel formats and pixel format autoselection.

Signed-off-by: Thilo Borgmann <thilo.borgmann@mail.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge commit 'ceada893bec1e29e457bd2b81d8a0b6fcba5f1f7'

* commit 'ceada893bec1e29e457bd2b81d8a0b6fcba5f1f7':
  libx265: Remove unneeded bit depth check

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

Merge commit '61a344916d324c8ca52064964478f46c877f02e2'

* commit '61a344916d324c8ca52064964478f46c877f02e2':
  libx265: Add 4:2:2 support

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

Merge commit '180e6b48060f97fdd8497320395b61dc85664ecd'

* commit '180e6b48060f97fdd8497320395b61dc85664ecd':
  libx265: Actually use X265_API_IMPORTS

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

configure: use pkg-config for libx264

Merge commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4'

* commit 'dca7ba4bffe3e4aeb620cb62955256a0d87561f4':
  Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

Conflicts:
libavcodec/ac3enc_float.c

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

libx265: Remove unneeded bit depth check

This is no longer needed since the version bump.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Add 4:2:2 support

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Actually use X265_API_IMPORTS

It obvously needs to be above the include statement.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Remove unneeded bit depth check

This is no longer needed since the version bump.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Remove some unnecessary CONFIG_FOO_COMPONENT ifdefs

The files are only ever compiled if that condition is true.

libx265: Add 4:2:2 support

It is also not final yet, so require -strict experimental.

Requires a bump to version 17.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

libx265: Actually use X265_API_IMPORTS

It obvously needs to be above the include statement.

Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>

Merge commit '48e50921337984ba4ec2c1cafe45d43787f84498'

* commit '48e50921337984ba4ec2c1cafe45d43787f84498':
  avconv: make -shortest work with streamcopy

Conflicts:
ffmpeg.c

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

avfilter/avf_showcqt: add option for lower resolution

Resolution can be 1920x1080 or 960x540.

avconv: make -shortest work with streamcopy

CC: libav-stable@libav.org

vp9/x86: fix overwrite in ipred_vl_4x4_ssse3.

Fixes track ticket 3717.

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

avcodec/libx264: fix "bitrate reconfiguration"

Merge commit '2f4170312f605c1f02a14c01347e94cf46726dbd'

* commit '2f4170312f605c1f02a14c01347e94cf46726dbd':
  libx264: Support bitrate reconfiguration

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

x86: huffyuv: fix {add,diff}_int16

They used an extra, undeclared register. Fixes a crash in
fate-vsynth3-ffvhuff444p16

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

Merge commit 'cd62c04d009b3baf7582556866a7029291b54573'

* commit 'cd62c04d009b3baf7582556866a7029291b54573':
  h263enc: keep block_last_index always valid during advanced intra coding

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

libx264: Support bitrate reconfiguration

Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Merge commit '0ddc53dabbc6f636d062b187ea27934610aaad30'

* commit '0ddc53dabbc6f636d062b187ea27934610aaad30':
  mpegvideo: synchronize AVFrame pointers in ERContext fully

Conflicts:
libavcodec/mpegvideo.c

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