* commit '43e7f079':
  flvenc: only write the framerate tag based on avg_frame_rate

Conflicts:
	tests/ref/lavf/flv_fmt
	tests/ref/seek/lavf-flv_fmt
	tests/ref/seek/vsynth2-flv
	tests/ref/vsynth/vsynth1-flashsv
	tests/ref/vsynth/vsynth1-flv
	tests/ref/vsynth/vsynth2-flashsv
	tests/ref/vsynth/vsynth2-flv
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cf697771':
  movenc: write avg_frame_rate as the framerate, not the codec timebase
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '81eec081':
  matroskaenc: base DefaultDuration on the framerate, not the codec timebase

Conflicts:
	libavformat/matroskaenc.c
	tests/ref/lavf/mkv
	tests/ref/seek/lavf-mkv

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

* commit 'a53551cb':
  frame: fix the error path in av_frame_copy_props()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Do not fall back on the codec timebase, since that can be anything for
VFR video.

This results in DefaultDuration not being written when the framerate is
not known, but as this field is purely informative, this should not
break any sane demuxers.

First free metadata, then the side data it is contained in.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Its implied by sp_count==0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

When the index is not written, several data tables become unneeded,
reducing memory and cpu requirements.
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>

The code appears to assume STABLE will never change
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The broadcast/pipe flags arent stable + 1 they would be 4 or whenever but wouldnt change based
on which is stable
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ad0fe2f4':
  af_resample: Use avresample_get_out_samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b2d45654':
  avresample: Add avresample_get_out_samples
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c94e2e85':
  nut: Support experimental NUT 4 features

Conflicts:
	doc/nut.texi
	libavformat/nut.h
	libavformat/nutdec.c
	libavformat/nutenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '6d212599':
  avformat: Provide a standard compliance flag

Conflicts:
	doc/APIchanges
	libavformat/avformat.h
	libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

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

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

The official samples are 50% smaller
Avoid having reference samples which are strongly linked to the used resampler
implementation. (which for example would require new samples to be used if this
implementation changes)
Also its more correct to use the official samples instead of the current
decoder output

also enable tests
The tests also fully pass as well with the previous samples.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

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

Utility function to get the upper bound on the number of samples the
resampler would output.

Add the low overhead pipe mode and the extended broadcast mode.
Export the options as 'syncponts' since it impacts only that.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

Provide f_strict for avconv usage.
Signed-off-by: Luca Barbato <lu_zero@gentoo.org>

* commit '7dba055b':
  oggenc: Fix the EOS flag

Conflicts:
	tests/ref/lavf/ogg

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

This corrects the bug that caused the checksums to change in
9767d7c0.

It caused the EOS flag to be set incorrectly; the ogg spec does not
allow it to be set in the middle of a logical bitstream.
Signed-off-by: Andrew Kelley <superjoe30@gmail.com>
Signed-off-by: Martin Storsjö <martin@martin.st>

Opus in WebM is no more experimental as we have everything necessary in
the container writing code as per the spec. So removing the experimental flag.
Note that we removed the experimental suffix from the CodecId field long
ago ( http://goo.gl/O0TYRB ).
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

This way other streams can still be used with the -map option.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The xmm reg count was incorrect, and manual loading of the gprs
furthermore allows to noticeable reduce the number needed.

The modified functions are used in weighted prediction, so only a
few samples like WP_* exhibit a change. For this one and Win64
(some widths removed because of too few occurrences):

WP_A_Toshiba_3.bit, ff_hevc_put_hevc_uni_w
         16    32
before: 2194  3872
after:  2119  3767

WP_B_Toshiba_3.bit, ff_hevc_put_hevc_bi_w
         16    32    64
before: 2819  4960  9396
after:  2617  4788  9150
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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

* commit 'b5aa4855':
  ppc: Move vec_unaligned_load macro to util_altivec
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '593886b5':
  ppc: util_altivec: Drop unused macros
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '106b62f4':
  matroskaenc: write the channel mask for FLAC

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