h264: integrate clear_blocks calls with IDCT.

The non-intra-pcm branch in hl_decode_mb (simple, 8bpp) goes from 700
to 672 cycles, and the complete loop of decode_mb_cabac and hl_decode_mb
(in the decode_slice loop) goes from 1759 to 1733 cycles on the clip
tested (cathedral), i.e. almost 30 cycles per mb faster.

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

svq3: fix decoding residual blocks of b-frames.

The residual block data of 16x16 blocks was ignored for b-frames, which
leads to easy-to-identify artifacts. After this patch, the artifacts are
gone. Sample video: svq3_watermark.mov. (Fate results unaffected.)

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

avfilter/ff_merge_formats: only merge if doing so does not loose chroma or alpha

Fixes Ticket1280

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

x86/h263_loopfilter: Fix author attribution after code has been moved/splited around

    Reference:
    commit 3615e2be846f6382aa42360d02d16b25f443af9f
    Author: Michael Niedermayer <michaelni@gmx.at>
    Date:   Tue Dec 2 22:02:57 2003 +0000

        h263_h_loop_filter_mmx

        Originally committed as revision 2553 to svn://svn.ffmpeg.org/ffmpeg/trunk

    commit 359f98ded95ec65f7109b25f3cfaa9189c4fab9c
    Author: Michael Niedermayer <michaelni@gmx.at>
    Date:   Tue Dec 2 20:28:10 2003 +0000

        h263_v_loop_filter_mmx

        Originally committed as revision 2552 to svn://svn.ffmpeg.org/ffmpeg/trunk
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86: dsputil: Fix h263 loop filter link error in some configurations

Conflicts:
libavcodec/x86/dsputil.asm

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

Merge commit '7a03145ed7cb4f1ce794b5126559dd6f38029243'

* commit '7a03145ed7cb4f1ce794b5126559dd6f38029243':
  x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size param

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

Merge commit '202b5f6deb65e405b07b9b5c20f97c8cb925cf49'

* commit '202b5f6deb65e405b07b9b5c20f97c8cb925cf49':
  doc: Fix some obsolete references to av* tools as ff* tools

Conflicts:
doc/demuxers.texi

No code changes, merge for metadata only

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

tmv: initialize unused pallete entries with 0

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavfi/overlay: yuv444p & yuva444p support

Signed-off-by: Paul B Mahol <onemda@gmail.com>

h264: put visualization and debug support back

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

mpegvideo: make ff_print_debug_info independant of mpegvideo

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

split out ff_hwaccel_pixfmt_list_420[] over individual codecs.

Not all hwaccels implement all codecs, so using one single list for
multiple such codecs means some codecs will be represented in the list,
even though they don't actually handle that codec. Copying specific
lists in each codec fixes that.

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

lavfi/histogram: overlay display mode for levels histogram mode

Signed-off-by: Paul B Mahol <onemda@gmail.com>

nutenc: only write an index if there are syncpoints

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

ff_gen_search: Fix finding the maximum timestamp in a really small file

Fixes Assertion failure

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

ff_read_timestamp: check stream_index before using it as array index

Fixes out of array read

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

cdgraphics: set palette to zero too

Signed-off-by: Paul B Mahol <onemda@gmail.com>

lavc/cdxl: clear palette before reading it

Signed-off-by: Paul B Mahol <onemda@gmail.com>

x86: dsputil: Fix h263 loop filter link error in some configurations

This was caused by unconditionally referencing a conditionally compiled
table. Now the code is also compiled conditionally.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

x86: dsputil: int --> ptrdiff_t for ff_put_pixels16_mmxext line_size param

This avoids SIMD-optimized functions having to sign-extend their
line size argument manually to be able to do pointer arithmetic.

Signed-off-by: Diego Biurrun <diego@biurrun.de>

x86/dsputil: fix compilation when h263 decoder/encoder are disabled.

The symbol "ff_h263_loop_filter_strength" is defined in h263.c, but
the h263 loopfilter functions (in the .asm file) are not optimized
out (even though their function pointers are never assigned).

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

h264/svq3: stop using draw_edges.

Instead, only extend edges on-demand when the motion vector actually
crosses the visible decoded area using ff_emulated_edge_mc(). This
changes decoding time for cathedral from 8.722sec to 8.706sec, i.e.
0.2% faster overall. More generally (VP8 uses this also), low-motion
content gets significant speed improvements, whereas high-motion content
tends to decode in approximately the same time.

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

lavf/showspectrum: add divVerent in the (c) for his recent work on the filter.

doc: Fix some obsolete references to av* tools as ff* tools

Signed-off-by: Diego Biurrun <diego@biurrun.de>
CC: libav-stable@libav.org

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  svq3: unbreak decoding

No change to the code as this fix was already part of FFmpeg

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

Merge commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b'

* commit 'aa11cb79318baa3415d553424ba378f6c62e1f9b':
  build: make audio_frame_queue a stand-alone component

Conflicts:
configure
libavcodec/Makefile

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

Merge commit '870a0c669e536d56c6325d84f65e34c53792398e'

* commit '870a0c669e536d56c6325d84f65e34c53792398e':
  build: The libopencore-amrnb encoder depends on audio_frame_queue

Conflicts:
libavcodec/Makefile

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

Merge commit '8837f4396a1a458a0efb07fe7daba7b847755a7a'

* commit '8837f4396a1a458a0efb07fe7daba7b847755a7a':
  libopencore-amrwb: Make AMR-WB ifdeffery more precise

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

Merge commit 'e6bda9a9fd86505927a2e095e495eae104860701'

* commit 'e6bda9a9fd86505927a2e095e495eae104860701':
  libopencore-amr: Conditionally compile decoder and encoder bits

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

Merge commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17'

* commit '56632fef65c0cb6946ed3648ded3d7b82e5c5c17':
  libopencore-amrnb: cosmetics: Group all encoder-related code together

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

Merge commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7'

* commit '0b70fb1d518cbd796545fd6eef02772cd0d892c7':
  dsputil: convert remaining op_pixels_func

No changes to the code as all these fixes already existed in FFmpeg.

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

Merge commit '488f87be873506abb01d67708a67c10a4dd29283'

* commit '488f87be873506abb01d67708a67c10a4dd29283':
  roqvideodec: check dimensions validity
  vqavideo: check chunk sizes before reading chunks
  qdm2: check array index before use, fix out of array accesses

Conflicts:
libavcodec/qdm2.c
libavcodec/roqvideodec.c
libavcodec/vqavideo.c

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

svq3: unbreak decoding

a7d2861d36756b913e85681b86ed3385274e8ced removed necessary braces.

h264: don't store intra pcm samples in h->mb.

Instead, keep them in the bitstream buffer until we read them verbatim,
this saves a memcpy() and a subsequent clearing of the target buffer.
decode_cabac+decode_mb for a sample file (CAPM3_Sony_D.jsv) goes from
6121.4 to 6095.5 cycles, i.e. 26 cycles faster.

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

v4l2: try to fix build on BSD

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

lavfi/noise: switch to AVLFG noise generator

Signed-off-by: Paul B Mahol <onemda@gmail.com>

h264: don't initialize missing pictures when using VDPAU.

This fixes an assertion failure when running mplayer -vc ffh264vdpau.

Reported by irc user ioni.

h264: avoid calling get_format() multiple times

Some applications do not like that.
Fixes VDA
Reduces noise for VDPAU

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

build: make audio_frame_queue a stand-alone component

Encoders requiring it have the dependency expressed in the
configure.

Revert "swfenc: use av_get_audio_frame_duration() instead of AVCodecContext.frame_size"

This reverts commit 620b88a302d522f71a6a95aff500cf7bd8520043.

Fixes ticket #2272.

Conflicts:
libavformat/swfenc.c

Add yvu410 as a supported v4l2 input format.

Add gray16 as a supported v4l2 input format.

fate: add print() to the tests of eval

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

eval: print() support

This allows printing values via av_log from expressions.

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

Only set accelerated arm fft functions if fft is enabled.

Fixes lavc compilation (linking) for configurations without fft.

Reported-by: tyler wear
Tested-by: Gavin Kinsey

doc/codecs: simple sub_charenc option documentation.

doc/examples: do not allocate AVFrame directly.

The size of the AVFrame structure is not part of the ABI;
it can grow with later versions. Therefore, applications
are not supposed to allocate AVFrame directly, they are
supposed to use avcodec_alloc_frame() instead.

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  error_resilience: add required headers.

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

lavf/subtitles: error out in case of bitmap subtitles.

lavc: fix codec_descriptor and pkt_timebase doxy.

tests: fix values for the unsharp test

Set odd size for unsharp matrices, even values are not accepted.

lavc/utils: reindent in avcodec_decode_subtitle2() after f7963993.

lavfi/subtitles: set a different description between ass and subtitles.

lavfi: rename vf_ass.c to vf_subtitles.c

lavfi/subtitles: support charenc option.

lavfi/subtitles: split options between ass and subtitles.

lavc: support subtitles character encoding conversion.

build: The libopencore-amrnb encoder depends on audio_frame_queue

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

libopencore-amrwb: Make AMR-WB ifdeffery more precise

The library might provide an encoder in the future, so it's better to
check for the presence of the decoder rather than just the library.

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

libopencore-amr: Conditionally compile decoder and encoder bits

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

libopencore-amrnb: cosmetics: Group all encoder-related code together

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

dsputil: convert remaining op_pixels_func

Convert to diffptr_t the line_size parameters still int.

Remove all the warnings in dsputil.c

lavc: mark bitmap based subtitles codecs as such.

lavfi/mp: drop mp=kerndeint filter

The filter has been natively integrated into libavfilter.

lavfi/mp: drop mp=unsharp filter

The native filter is equivalent from the point of view of the features
and of performances.

lavfi/unsharp: add missing NULL check

lavfi/unsharp: merge definition and declaration in init_filter_param()

lavfi/unsharp: directly access in-loop variables in apply_unsharp()

Increase performance, to match mp=unsharp.

lavfi/unsharp: add check on matrix x/y size values oddity

roqvideodec: check dimensions validity

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 3ae610451170cd5a28b33950006ff0bd23036845)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit fee26d352a52eb9f7fcd8d9167fb4a5ba015b612)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>

vqavideo: check chunk sizes before reading chunks

Fixes out of array writes

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit ab6c9332bfa1e20127a16392a0b85a4aa4840889)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit 13093f9767b922661132a3c1f4b5ba2c7338b660)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>

qdm2: check array index before use, fix out of array accesses

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit a7ee6281f7ef1c29284e3a4cadfe0f227ffde1ed)

CC: libav-stable@libav.org
Signed-off-by: Reinhard Tartler <siretart@tauware.de>

error_resilience: add required headers.

Changelog: Add entry for encrypted TTA stream decoding

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

lavc/tta: Use a safer check for encrypted streams

The user can provide a password even when the stream
is not encrypted, so check the value of s->format
instead of s->pass in ttafilter_init().

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

h264: don't initialize missing pictures when using a hwaccel

Writing into uninitialized hw surfaces is not supported and triggers an assert inside avpriv_color_frame

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

lavu: Fix checkheaders for x86/emms.h

internal.h doesn't need to include cpu.h anymore since
the relevant code was moved to x86/emms.h

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

Merge remote-tracking branch 'qatar/master'

* qatar/master:
  h264: deMpegEncContextize

Conflicts:
libavcodec/dxva2_h264.c
libavcodec/h264.c
libavcodec/h264.h
libavcodec/h264_cabac.c
libavcodec/h264_cavlc.c
libavcodec/h264_loopfilter.c
libavcodec/h264_mb_template.c
libavcodec/h264_parser.c
libavcodec/h264_ps.c
libavcodec/h264_refs.c
libavcodec/h264_sei.c
libavcodec/svq3.c

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

Merge commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885'

* commit '1d0feb5d1ac04d187b335f0e8d411c9f40b3a885':
  mpegvideo: split ff_draw_horiz_band().

Conflicts:
libavcodec/vc1dec.c

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

Merge commit '54974c62982ae827becdbdb9b620b7ba75d079a0'

* commit '54974c62982ae827becdbdb9b620b7ba75d079a0':
  error_resilience: decouple ER from MpegEncContext

Conflicts:
libavcodec/error_resilience.c
libavcodec/h263dec.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/vc1dec.c

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

Changelog: add missing empty line after the version line

Merge commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc'

* commit 'd9ebb00dcbaac3812b8b1fbc3d6e027506c11cbc':
  svq3: remove a pointless if()
  h264: remove a pointless if()

Conflicts:
libavcodec/h264.c
libavcodec/svq3.c

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

Merge commit '68f930d2188aba5b32624887dcbf688c23482834'

* commit '68f930d2188aba5b32624887dcbf688c23482834':
  h264: simplify calls to ff_er_add_slice().

Conflicts:
libavcodec/h264.c

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

cinepack: print an error if cinepak_decode() failed

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

yadif: remove unused variable

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

Merge commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793'

* commit 'd2a25c4032ce6ceabb0f51b5c1e6ca865395a793':
  get_buffer(): do not initialize the data.

Conflicts:
libavcodec/utils.c

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

h264: color frames gray

This prevents a regression from the removial of the buffer
initialization

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

avcodec: add avpriv_color_frame()

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

lavfi: port MP noise filter

Signed-off-by: Paul B Mahol <onemda@gmail.com>

mpegvideo_enc: draw edges on input

Improves Motion estimation, avoids using out of picture areas for %16 != 0

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

Merge commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82'

* commit '64ed397635ef2666b0ca0c8d8c60a8bc44581d82':
  vf_yadif: fix out-of line reads

Conflicts:
libavfilter/vf_yadif.c
tests/ref/fate/filter-yadif-mode0
tests/ref/fate/filter-yadif-mode1

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

Merge commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13'

* commit 'ccd70d9c1689990e5aef2de383199bbc7cf60d13':
  vf_yadif: factorize initializing the filtering callbacks

Conflicts:
libavfilter/vf_yadif.c

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

Merge remote-tracking branch 'cus/stable'

* cus/stable:
  ffplay: only display frames if there are no pending events
  ffplay: remove remains of video_clock
  ffplay: remove refresh thread to achieve more precise frame delay

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

lavfi/yadif: support 9, 12, and 14 bits per pixel

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

lavfi/yadif: remove unnecessary cast

Finish what 99162f8 started

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

lavfi/kerndeint: move is_rgb_packed definition to the internal context

No need to recompute it for each new frame.

lavfi/kerndeint: use aligned linesizes for the temporary buffer.

This improves the performances just enough to match mp=kerndeint.

Signed-off-by: Stefano Sabatini <stefasab@gmail.com>

lavfi/unsharp: extend range for amount values, to reflect the behavior of mp=unsharp

Also update the documentation accordingly, and suggest a meaningful range.

doc/filters: itemize unsharp examples

Also drop pointless example.

lavfi/unsharp: use named options, and add missing checks on matrix size values

In particular, avoid out-of-buffer access and crashes with too big
values, and rework documentation accordingly.