configure: use pkg-config for libx264
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>
libavcodec/wmv2: remove dead code

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Merge remote-tracking branch 'upstream/master'
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>
Rename tpel_template.c ---> pel_template.c

The new name more accurately describes what the file is about.
ac3: Only initialize float_dsp for the float encoder variant
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>
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>
avcodec/rv34: fix edge emu with uv stride <= 25

Signed-off-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>
Merge commit 'f0ce9913d0974ac0c7371a62c3324dd2863b5d1b'

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

Merged-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>
vfilter/avf_showcqt: fix 'mixed declarations and code'

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avcodec/svq1enc: fix encoding of small widths

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
avfilter/vf_unsharp: use av_malloc_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/formats: Use av_realloc_array()

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/af_asetnsamples: fix pts handling when timebase and 1/samplerate differ

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