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

Guesses the sample aspect ratio of a frame, based on both the stream and the
frame aspect ratio.

Since the frame aspect ratio is set by the codec but the stream aspect ratio
is set by the demuxer, these two may not be equal. This function tries to
return the value that you should use if you would like to display the frame.

Basic logic is to use the stream aspect ratio if it is set to something sane
otherwise use the frame aspect ratio. This way a container setting, which is
usually easy to modify can override the coded value in the frames.
Signed-off-by: Marton Balint <cus@passwd.hu>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master: (25 commits)
  vcr1: Add vcr1_ prefixes to all static functions with generic names.
  vcr1: Fix return type of common_init to match the function pointer signature.
  vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
  motion-test: remove disabled code
  gxfenc: remove disabled half-implemented MJPEG tag
  x86: use more standard construct for setting ASM functions in FFT code
  fate: westwood-aud: disable decoding
  fate: caf: disable decoding
  fate: film-cvid: drop pcm audio and rename test
  fate: d-cinema-demux: drop unnecessary flags
  fate: split off dpcm-interplay from interplay-mve tests
  fate: rename funcom-iss to adpcm-ima-iss
  fate: rename cryo-apc to adpcm-ima-apc
  fate: rename adpcm-psx-str-v3 to adpcm-xa
  fate: split off adpcm-ms-mono test from dxa-feeble
  fate: split off adpcm-ima-ws test from vqa-cc
  fate: add adpcm-ima-smjpeg test
  fate: split off adpcm-ima-amv from amv test
  fate: separate bmv audio and video tests
  fate: separate delphine-cin audio and video tests
  ...

Conflicts:
	doc/platform.texi
	libavcodec/vcr1.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/ref/fate/ea-mad-pcm-planar
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/mtv
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/qtrle-2bit
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
	tests/ref/fate/vqa-cc
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Some environments, for example Android, pretend to have pthreads
but actually have only a partial implementation.

Also remove the unused print_fmt_opt() in the process.

The details on reference ownership and permissions are missing.

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

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

libavcodec/vcr1.c:182: warning: initialization from incompatible pointer type

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

This restores correct block_align values in case of stream copy.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

this is simpler and closer to how timestamps are found for seeking.

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

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

The codec (adpcm-ima-ws) is tested elsewhere.  Using framecrc output
provides more information than a single md5 if something goes wrong.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This is intended as a demuxer test and the file contains pcm_s16be
audio which is tested elsewhere.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

These two files use the same audio codec so only one test for
this is needed.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This matches the name of the codec.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This matches the name of the tested codec.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This matches the name of the codec tested.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

Signed-off-by: Mans Rullgard <mans@mansr.com>

These tests include adpcm-ima-dk3 audio which is tested elsewhere.
Signed-off-by: Mans Rullgard <mans@mansr.com>

These files contain mace6 audio which is tested elsewhere.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This file has eamad video which is tested elsewhere.
Also rename the test to reflect this change.
Signed-off-by: Mans Rullgard <mans@mansr.com>

This test contains raw rgb565le video.  Converting to rgb24 serves
no useful purpose here.
Signed-off-by: Mans Rullgard <mans@mansr.com>

Fix some orthography, wording and grammar issues; update the SDL section
with more current instructions; simplify lib.exe example command line;
drop outdated comments about libnut.