* commit 'e7d20f12':
  movenc: Remove a now redundant check
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1d8a0c1b':
  movenc: Allow to request not to use edit lists

Conflicts:
	libavformat/movenc.c

See: 537ef8beMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '897d5c3a':
  lavf: Print a warning if failed to avoid negative timestamps when requested

Conflicts:
	libavformat/mux.c

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

* commit '1384df64':
  lavf: Add an option for avoiding negative timestamps

Conflicts:
	libavformat/avformat.h
	libavformat/mux.c
	libavformat/options_table.h
	libavformat/version.h

See: 3ba0dab7
See: a89c0125Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4981baf9':
  avstring: Mark some character handling functions av_const
Merged-by: Michael Niedermayer <michaelni@gmx.at>

13797 decicycles in ff_float_to_int32_a_sse2, 32768 runs, 0 skips
8603 decicycles in ff_float_to_int32_a_avx2, 32766 runs, 2 skips
Reviewed-by: Christophe Gisquet <christophe.gisquet@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>

Fixes: 4163724_300.jpg
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

When using the new first_trun flag instead of checking the track id,
we don't need to have a special case for the separate_moof flag
any longer.

This simplifies the complicated codepath ever so slightly.
Signed-off-by: Martin Storsjö <martin@martin.st>

libavcodec/ppc/hpeldsp_altivec.c : fix ff_put_pixels16_altivec() put_no_rnd_pixels16_xy2_altivec() put_no_rnd_pixels8_xy2_altivec() avg_pixels8_altivec() avg_pixels8_xy2_altivec() put_pixels16_xy2_altivec() put_pixels8_xy2_altivec() ff_avg_pixels16_altivec() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

In this case, shift tracks to start from zero instead (potentially
stretching the first sample in tracks that start later than the
first one).

Some software does not support edit lists at all, the adobe flash
player seems to be one of these. This results in AV sync errors when
edit lists are used to adjust AV sync.

Some players, such as QuickTime, don't respect the duration for
audio packets, so if an audio track starts later than the video
track and the first audio sample gets a duration longer than the
actual amount of data in it, the result will be out of sync.

Based on patches by Michael Niedermayer.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

This is the same logic as is invoked on AVFMT_TS_NEGATIVE,
but which can be enabled manually, or can be enabled
in muxers which only need it in certain conditions.

Also allow using the same mechanism to force streams to start
at 0.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

libavutil/ppc/util_altivec.h : fix unaligned_load() vec_unaligned_load() add macros VEC_LD() VEC_MERGEH() VEC_MERGEL() VEC_ST() for POWER LE
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

based on tables of aac encoders from libavcodec
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

There's no benefit from using blendps here except on CPUs with AVX, where
it's faster than shufps according to Intel's documentation.
As such, rename the sse4 functions to sse/sse2 and use shufps instead.
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Almer <jamrial@gmail.com>

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

* commit '199d9f99':
  mjpegdec: fix undefined shift

Conflicts:
	libavcodec/mjpegdec.c

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

* commit 'ac4a5e3a':
  pthreads_frame: Do not leak on failure path

See: 11679e1bMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5d29efe4':
  mpeg12dec: simplify context duplication

Not merged, theres no point in copying data and afterwards zeroing it
Also zeroing is not correct on its own
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '37b3361e':
  mpeg12enc: factor out check in encode_dc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0a666470':
  mpegvideo_enc: factor out denominator and explicitly cast operands

Conflicts:
	libavcodec/mpegvideo_enc.c

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

* commit 'e0a1d0a2':
  mpegvideo_enc: rework direct mode check

Conflicts:
	libavcodec/mpegvideo_enc.c

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

Add a comment to explain the code.

CC: libav-stable@libav.org
Bug-Id: CID 1194388

CC: libav-stable@libav.org
Bug-Id: CID 1135767
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

CC: libav-stable@libav.org
Bug-Id: CID 717453 / CID 717454 / CID 717915

Makes coverity less confused and the code more readable.

CC: libav-stable@libav.org
Bug-Id: CID 751744

CC: libav-stable@libav.org
Bug-Id: CID 608053

Remove stray semicolon and share codepaths.

CC: libav-stable@libav.org
Bug-Id: CID 991857

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

We now use 'pixelformat' for V4L2_PIX_FMT_* (as they do in v4l2
documentation) and 'pix_fmt' for AVPixelFormat.

No functional change in the code.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

No testcase available but this seems more correct
Signed-off-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>

Fixes "warning: passing argument 1 of avpriv_split_xiph_headers discards const qualifier from pointer target type"
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>