Enable compilation on machines with an old libfdk-aac.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  fate: force the simple idct for xvid custom matrix test

Conflicts:
	tests/fate/xvid.mak
	tests/ref/fate/xvid-custom-matrix

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

* commit 'a1e1f352':
  lavu: add missing log.h include in timer.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

If a special comment packet shows up in the middle of the stream, we
should extract it out into the vorbis stream metadata dictionary.

Also, if there is metadata in the packet on the way in, it might linger
since we only add data to the dictionary causing stale metadata to be
inserted into the stream. Instead, clear it to remove any doubt about
what is new and old.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Currently, if there are multiple 'performer' tags, the last one is the
only one which appears. Instead, join them with a semicolon.
Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Ben Boeckel <mathstuf@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Setting seek_preroll value in AVCodecContext for Opus streams
embedded in ogg container.
Signed-off-by: Vignesh Venkatasubramanian <vigneshv@google.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The original test without a forced idct is still useful since it tests
the switching of the idct algorithm/permutation on x86 with MMX. MMXext
or SSE2. Make sure the test runs only if MMX inline asm is available and
force -cpuflags to all.
Add the required bitexact flag for both tests.

Also use real name with a '-' instead of '_'.
Signed-off-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cus/stable:
  ffplay: flush subtitle codecs as well with null packets
  ffplay: reorder the filters to ensure that inputs of the custom filters are merged first
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master:
  mpeg: K&R formatting cosmetics

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

* commit '9ecb8587':
  doxy: Format @code blocks so they render properly
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd9ae1031':
  lavf: improve handling of sparse streams when muxing

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

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

* commit '4c3e1956':
  lagarith: reallocate rgb_planes when needed

Conflicts:
	libavcodec/lagarith.c

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

* commit '2240e207':
  truemotion1: check the header size

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

* commit '1713eec2':
  shorten: pad the internal bitstream buffer

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

* commit '54308391':
  eacmv: clear references on frame dimensions change

Conflicts:
	libavcodec/eacmv.c

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

* commit '0e830094':
  samplefmt: avoid integer overflow in av_samples_get_buffer_size()
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '190d4a44':
  avcodec: Suppress deprecation warnings from avcodec_alloc_frame()

Conflicts:
	libavcodec/utils.c

No change as we dont call this deprecated function
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd509ae5b':
  jvdec: K&R formatting cosmetics

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

Signed-off-by: Marton Balint <cus@passwd.hu>

For more info see http://ffmpeg.org/pipermail/ffmpeg-user/2013-December/018761.htmlSigned-off-by: Marton Balint <cus@passwd.hu>

Also adjust header #include order and some comments.
Signed-off-by: Diego Biurrun <diego@biurrun.de>
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

@code command reports verbatim everything between it and @endcode.
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Currently ff_interleave_packet_per_dts() waits until it gets a frame for
each stream before outputting packets in interleaved order.

Sparse streams (i.e. streams with much fewer packets than the other
streams, like subtitles or audio with DTX) tend to add up latency and in
specific cases end up allocating a large amount of memory.

Emit the top packet from the packet_buffer if it has a time delta
larger than a specified threshold.

Original report of the issue and initial proposed solution by
mus.svz@gmail.com.

Bug-id: 31
Signed-off-by: Anton Khirnov <anton@khirnov.net>

Fixes invalid writes on pixel format changes.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

Fixes invalid reads.

Found-by: Mateusz "j00ru" Jurczyk and Gynvael Coldwind
CC:libav-stable@libav.org

it should always be 0
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

CC:libav-stable@libav.org

* commit '1f097d16':
  h264: reset data partitioning at the beginning of each decode call
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'e46ad30a':
  vp8: use a fixed-size edge emu buffer

Conflicts:
	libavcodec/vp8.c
	libavcodec/vp8.h

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

Fixes null pointer dereference
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>