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

* cehoyos/master:
  buildsys: only include log2_tab per library for shared builds
  Add h264chroma dependency for cavs decoder to configure.
  Add h264qpel dependency for snow codec to configure.
  Add h264chroma dependency for vp5 and vp6 decoder to configure.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Fix linking failures with -all_load due to multiple log2_tabs
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

Fix building for some unusual configurations.

Fix building for some unusual configurations.

Fix building for some unusual configurations.

This should fix build after 88d55b82.

It seems to break a lot on MacOS because of a mixup between multiple
iconv libraries. The issue is that the configure check link with no
particular library path (so it uses /usr/lib/libiconv.dylib where all
the symbols are defined). OTOH, the final build might link with extra
library paths, such as the ports lib directory (typically you get
-L/opt/local/lib because of an extra library such as SDL). Whatever this
option position (before or after -liconv), it will try to link with
/opt/local/lib/libiconv.dylib, and the issue is that this version has
the same symbols as the ones in /usr/lib/libiconv.dylib except that they
all start with 'lib' (libiconv_open, libiconv_close, ...). I don't plan
to try to workaround this mess, so any better solution is welcome.

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

Fix build after 88d55b82.

As far as I can tell the code should not change behaviour
depending on locale in any of these places.
Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>

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

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

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

Fixes part of Ticket1550
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Improves error message for Ticket968
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* cehoyos/master:
  movenc: Do not flag secondary audio and subtitle tracks as enabled.
Merged-by: Michael Niedermayer <michaelni@gmx.at>

The code is located in mpegvideo, and it's likely that in a minimal
config, we don't want to include debug info anyway.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Fixes ticket #468 and ticket #1174.
Signed-off-by: Carl Eugen Hoyos <cehoyos@ag.or.at>

* qatar/master:
  rtpdec: Initialize some variables to silence compiler warnings
Merged-by: Michael Niedermayer <michaelni@gmx.at>

This makes the decoder independent of mpegvideo.
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>

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

The warnings are false positives, older gcc versions (such as 4.5)
think the variables can be used uninitialized while they in
practice can't, while newer (4.6) gets it right.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Fixes ticket #1888.

Fixes ticket #2266
Signed-off-by: James Almer <jamrial@gmail.com>

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

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

* qatar/master:
  h264: set ref_count to 0 for intra slices.

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

* commit '668e16a0':
  h264: on reference overflow, reset the reference count to 0, not 1.

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

* commit 'e671d3ad':
  h264: do not copy ref count/ref2frm when updating per-frame context
  flvdec: Check the return value of a malloc

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

* commit 'c91c63b5':
  flvdec: Don't read the VP6 header byte when setting codec type based on metadata

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

CC:libav-stable@libav.org

Since decode_slice_header() returns before the reference lists are
constructed, there are zero valid references.

CC:libav-stable@libav.org