* commit 'eae7338e':
  libx264: Make codec use the init-cleanup flag and mark it as init-thread-safe
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '74a1cad7':
  lclenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'bb428e00':
  hqx: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '43171886':
  huffyuvenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd90133b7':
  asvenc: Mark codec as init-thread-safe and init-cleanup
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'a4edaeb5':
  hq_hqa: Fix table data for profile 17
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b17cbb0b':
  riff: Add GMP4 fourcc for mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '3c04ec04':
  riff: Add GLV4 fourcc for mpeg4
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '5bba3ab0':
  internal: Make dlog/tlog a no-op when disabled

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

* commit 'b90adb0a':
  rtsp: Make sure we don't write too many transport entries into a fixed-size array
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Incorporated review comment.
Removed "__" from volatile.
Signed-off-by: Shivraj Patil <shivraj.patil@imgtec.com>
Reviewed-by: Nedeljko Babic <Nedeljko.Babic@imgtec.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-16-intra-only.webm

Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-15-segkey_adpq.webm

The unaligned size is not handled in setctx_2d(), causing edges of images
to have improper segmentation prediction, which causes visual artifacts
at image edges a few frames later.

See sample vp90-2-14-resize-fp-tiles-16-8.webm from the vp9 test vector
set to reproduce the issue.

Samples available at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-10-show-existing-frame.webm
http://downloads.webmproject.org/test_data/libvpx/vp90-2-10-show-existing-frame2.webmSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

Sample available at:
http://downloads.webmproject.org/test_data/libvpx/vp90-2-09-lf_deltas.webmSigned-off-by: Michael Niedermayer <michaelni@gmx.at>

This takes care of memory leaks on init error.

The table had a wrong table height and was missing the first line of bytes.
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>

Improves Coverity analysis, avoiding "double semicolon" CIDs.

CC: libav-stable@libav.org
Signed-off-by: Martin Storsjö <martin@martin.st>

If the file size is much larger than what is indicated in the XING
header, the demuxer assumes it's a concatenated file, and throws away
the (presumably) incorrect duration information. Unfortunately, this
also triggers if the id3 tags are very large (embedded pictures and
such). Then the half-baked heuristic not only breaks the duration
display, but also gapless audio.

Fix it by subtracting the size of the headers (the check is off by some
bytes, but that doesn't matter at all). Note that there could be an
arbitrary amount of tags _after_ the mp3 data, but hopefully these are
not too large to trigger the heuristic in practice.

Also add a warning when this happens.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: James Zern <jzern@google.com>

Signed-off-by: James Zern <jzern@google.com>

this quiets a warning:
Failed to set VP8E_SET_NOISE_SENSITIVITY codec control: Unspecified
internal error
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Zern <jzern@google.com>

replace 'Refer to and to sync...' with a reference to the section that
discusses updated the source tree.
Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Reviewed-by: Michael Niedermayer <michaelni@gmx.at>
Signed-off-by: James Zern <jzern@google.com>

While I'm not sure why exactly sure why the old code could end up in the
wrong position, using the generic index code is much simpler and is
known to work correctly.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1bd2646a':
  rtpenc_jpeg: Handle case of picture dimensions not dividing by 8

Conflicts:
	libavformat/rtpenc_jpeg.c

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

* commit 'eb7ddb50':
  rtsp: Don't warn about unparsed time ranges
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This avoids confusing syntax errors with awk later

Likely fixes awk errors at:
http://buildd.debian-ports.org/status/fetch.php?pkg=ffmpeg&arch=sparc64&ver=7%3A2.6.2-1&stamp=1428928967Reviewed-by: Timothy Gu <timothygu99@gmail.com>
Thanks-to: Andreas Cadhalpun <andreas.cadhalpun@googlemail.com> for the link
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

If rice_limit is 0, k can be 0 in decode_scalar, which calls show_bits(gb, k).
Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>