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

* cigaes/master:
  ffmpeg: use a rational for -aspect option.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The EC code does not support fields currently thus it makes no
sense to wait for these cases (which also the check doesnt handle
correctly)

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

Fixes second half of Ticket2414
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes first half of Ticket2414
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  srtp: Include rtpdec.h for RTP_MAX_PACKET_LENGTH
  rtpdec: Increase max rtp packet size to 8192
  lavf: Use RTP_MAX_PACKET_LENGTH instead of 1500
  h264pred: Add a few missing const declarations for ff_cropTbl derived pointers
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This was missed from 350ad50b - this fixes building the fate-srtp
test.
Signed-off-by: Martin Storsjö <martin@martin.st>

This fixes connecting to "Ceton InfiniTV4 PCIe & USB".
Signed-off-by: Martin Storsjö <martin@martin.st>

Signed-off-by: Martin Storsjö <martin@martin.st>

* cus/stable:
  ffplay: simplify video pts calculation
  ffplay: fix indentation
  ffplay: handle audio buffersink output properly with buffering filters
  ffplay: set time_base of audio filter buffer src
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

Native filter have reached similar performance.
Signed-off-by: Paul B Mahol <onemda@gmail.com>

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

Also use frame->pts instead of a standalone variable
Signed-off-by: Marton Balint <cus@passwd.hu>

Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes cases when the audio filter generates less or more frames than the input.
Signed-off-by: Marton Balint <cus@passwd.hu>

Fixes ticket #2408.
Signed-off-by: Marton Balint <cus@passwd.hu>

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

The pointers that get assigned ff_cropTbl were made const in
9e0f14f1, but other variables that transitively are assigned
based on these variables were missed.
Signed-off-by: Martin Storsjö <martin@martin.st>

Morphing was introduced in 0d6e5a17 and forced cos/sin computations
with some mult all the time. This commit makes sure these are computed
only when morphing is enabled.

WAV chunks must be even aligned. This patch skip the extra padding byte
if chunk size is odd.

Fixes ticket #2417.
Reviewed-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

* mbouron/master:
  lavf/mxfdec: handle identification metadata
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

* qatar/master:
  lavc: Move ff_cropTbl and ff_zigzag_direct from dsputil to mathtables

Conflicts:
	libavcodec/mathtables.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9e0f14f1':
  lavc: Make pointers to ff_cropTbl const
  vp3: Embed idct_permutation array directly in VP3DecoderContext

Conflicts:
	libavcodec/bit_depth_template.c
	libavcodec/vp3.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '610b18e2':
  x86: qpel: Move fullpel and l2 functions to a separate file
  bfin: Make vp3 functions static

Conflicts:
	libavcodec/bfin/vp3_bfin.c
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa8d8953':
  bfin: Don't use the vp3 idct functions if bitexact behaviour is expected

Conflicts:
	libavcodec/bfin/vp3_bfin.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

These are widely used throughout libavcodec, nothing dsputil-specific.

Change ff_cropTbl to a statically initialized table, to avoid
initializing it with a function call.
Signed-off-by: Martin Storsjö <martin@martin.st>

There's no point in these pointers not being const.
Signed-off-by: Martin Storsjö <martin@martin.st>

This way, they can be shared between mpeg4qpel and h264qpel without
requiring either one to be compiled unconditionally.
Signed-off-by: Martin Storsjö <martin@martin.st>