* commit 'e7d6d0bf':
  mov: Export geotag metadata fields

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

The '?xyz' form is used by android devices (and according to apple
mailing list archives, also by older iOS devices). The 'loci' field
(defined in 3GPP 26.244) is used by recent iOS devices.

Even though the loci field can contain an altitude, it was plain
0 in my sample. Just export longitude and latitude, in a string
format matching the one used by the '?xyz' metadata field.
Signed-off-by: NMartin Storsjö <martin@martin.st>

This reduces differences with the fork
Signed-off-by: NJames Almer <jamrial@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes Ticket3698
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes Ticket3700
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This makes the mp3 decoder produce the same result when repeatly flushing and decoding
Suggested-by: NDale Curtis <dalecurtis@chromium.org>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

APE is not the sole codec using scalarproduct_and_madd_int16.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'd816e125':
  dict: const correctness for av_dict_get() and av_dict_copy()

Conflicts:
	libavutil/dict.c
	libavutil/dict.h

See: e12a7324Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes Ticket3658
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

this filter is the same as showspectrum but with constant Q transform,
so frequency is spaced logarithmically

adpcm_ima_qt does not produce reproducible results, so it is temporarily
disabled (see #3701).
Signed-off-by: NTimothy Gu <timothygu99@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NTimothy Gu <timothygu99@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This prevents all results from being declared whenever the function is called.
Signed-off-by: NTimothy Gu <timothygu99@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Untested due to lack of hardware
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Before: 154861 decicycles
After:  152912 decicycles
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

An invalid entry already has the property of having a negative number
of bits, so remove the check on the reserved value, and rearrange the
code as a consequence.

346800 decicycles in 422, 262079 runs, 65 skips
168197 decicycles in gray, 262077 runs, 67 skips
Overall time: 7.878s

319076 decicycles in 422, 262096 runs, 48 skips
159875 decicycles in gray, 262057 runs, 87 skips
Overall time: 7.394s
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

10496 -> 9105 cycles.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

It's no longer used inside another specific macro, so rename it.
Also remove duplicated definition and realign code.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Found-by: NNiels Möller <nisse@lysator.liu.se>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

These where intended to maintain the previous behavior before dca_dmix_code()
but it is unclear (to me) which way is correct and no sample seem to trigger
the case, also they are incomplete for the purprose of error checking
Found-by: NNiels Möller <nisse@lysator.liu.se>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  Fix rc_max_rate documentation.
  Fix some fate filter tests with --target-path.
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

The mpegvideo decoder sets rc_max_rate since 25b7aa98.

* commit '39ec5e1c':
  avconv: Report the codec and the encoder separately
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

Avoid buffer overruns when processing some MOV files with the amerge
filter. Files produced by Adobe Premiere Pro CC have up to one second of audio
not interleaved. With common settings (<= 48kHz) that makes up to 47 frames so
a queue length of 64 makes sense.

Fixes ticket #3510.
Reviewed-by: NNicolas George <george@nsup.org>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

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

Before:
179436 decicycles in rgb, 32735 runs, 33 skips
Stripped object size: 23188

After:
154861 decicycles in rgb, 32738 runs, 30 skips
Stripped object size: 22736
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

When the joint table does not contain a valid entry, the decoding restarts
from scratch. By implementing the trick of jumping to the 2nd level of the
individual table (and inlining the whole), a speed improvement of 5-10%
is possible.

On a 1000-frames YUV4:2:0 video, before:
362851 decicycles in 422, 262094 runs, 50 skips
182488 decicycles in gray, 262087 runs, 57 skips
Object size: 23584
Overall time: 8.377

After:
346800 decicycles in 422, 262079 runs, 65 skips
168197 decicycles in gray, 262077 runs, 67 skips
Object size: 23188
Overall time: 7.878
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Bug-Id: 694

* commit '95b7fa17':
  oggenc: Support flushing the muxer

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

* commit 'd5a55981':
  build: check if AS supports the '.func' directive
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

This allows the caller to write all buffered data to disk, allowing
the caller to know at what byte position in the file a certain
packet starts (any packet written after the flush will be located
after that byte position).
Signed-off-by: NMartin Storsjö <martin@martin.st>

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

Fixes Ticket3670
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Fixes: Ticket3652
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

maybe 0.3% faster and simpler code

about 2 cycles (~1%) faster lag_get_rac()
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Only the xy2 functions aren't.
Signed-off-by: NJames Almer <jamrial@gmail.com>
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>