Suggested-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes compilation with --disable-everything --disable-network --enable-demuxer=matroska
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

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

* commit 'ca1e36a8':
  h264: fix build when error resilience is disabled

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

This fixes loosing the perfectly valid SAR when width=height=0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9e500efd':
  Add av_image_check_sar() and use it to validate SAR

Conflicts:
	libavcodec/dpx.c
	libavcodec/dvdec.c
	libavcodec/ffv1dec.c
	libavcodec/utils.c
	libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

gcc 4.2 seems not maintained anymore so theres no option besides
just working around it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit 'd349afb0':
  dv: cosmetics, reindent
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '650dee63':
  dv: get rid of global non-const tables

Conflicts:
	libavcodec/dv_profile.h
	libavcodec/dvdec.c
	libavcodec/dvenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '77811159':
  dvenc: initialize the profile only once, at init

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

* commit '452860d7':
  Use av_packet_rescale_ts() to simplify code.

Conflicts:
	doc/examples/muxing.c
	ffmpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '874390e1':
  lavc: add a convenience function for rescaling timestamps in a packet

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

The minimum Yasm/NASM version required to compile ffmpeg supports both
instruction sets
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It hasn't been used since 0.11, and it does not contain any useful
information except for the code name.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Clément Bœsch <u@pkh.me>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Instead, store them in the context and compute on each parameter change.

We do not allow the frame parameters to change during encoding, so there
is no need to do this for each frame.

Also suggest what can be done to workaround the limitation.

Based on avcodec.h documentation.

The order of error codes will be useful in my future fateserver patches.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '440842c4':
  stereo3d: add missing include guards
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The blockdsp split did not cover Alpha optimizations
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

It seems it is more secure to simply duplicate the computing routine from compute_pkt_fields to estimate_timings_from_pts.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

avcodec/h264: Use named identifier for single thread fall-back return from ff_h264_decode_slice_header()
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Fixes compilation with Sun C 5.12.
Reported by Bradley Mitchell in ticket #3649.

See commits
649c00c9
5fecfb7d
73b02e24Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '852c329a':
  configure: Drop duplicate pkg-config entry from help output

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

* commit 'b2290bf1':
  i263: skip dummy frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This will pick the "best" simple idct compatible idct
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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