Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a6d1bd05)

Also drop some CONFIG_DV_MUXER #ifdefs probably vestigial from before the
split of dvenc and dvdec.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f0a86769)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 1d4da6a4)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bb875b75)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3568853f)

This ensures a locally-unique name as well as marks the symbol as
FFmpeg-private at least by declaration.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 82e1f217)

The table is not used anywhere else on libavcodec.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 53493f9a)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 80944df7)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit e63dd5fb)

(cherry picked from commit efa6ce99)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 2762a7a2)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit e836b1b0)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit aeb2de1c)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 93e7490e)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit fef5649a)

The key string is supposed to contain the equals character,
too.  Since the checked string was wrong, and the return value
check was wrong too, it incorrectly seemed to work right before.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2b0decf6)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit dacbcd17)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 3bdc886c)

If audio_sync_method is >1 the resampler is used for audio drift
compensation, and do_audio_out() was causing an assert failure because
audio_resample was not set.

Fix issue 2516, which was introduced by SVN r25939.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 07b48f8c)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 78f318be)

The PathScale compiler miscompiles wrapping arithmetic without
these flags.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 5f3b8314)

Dragonfly, NetBSD, and OpenBSD do not support symbol versioning
although our link test passes.  Disable it explicitly for these
systems.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit a1e4b3f6)

(cherry picked from commit 7a5a168a)

(cherry picked from commit 2fd9035d)

Additionally, this fixes a warning when building with clang.

In mov demuxer, set adpcm_ms and adpcm_ima_wav frame size to stsd samples per packet.

This should be faster, is less code and fixes issue 2524
(allocation error would lead to crash).

With the removal of the libmpeg2 bitstream reader, MIN_CACHE_BITS
is always >= 25, so tests against smaller values can be removed.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit f162e988)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 611a6f59)

These whitespace changes improve the readability of the get_bits
macros.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit fb5c841d)

Some of the macros in get_bits.h include a final semicolon,
some do not.  This removes these or adds do {} while(0) around
the macros as appropriate and adds semicolons where needed in
calling code.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit bf5f9b52)

Using the libmpeg2 reader causes errors in a multitude of places,
including MPEG and H264 codecs.  As the advantage of this reader
is questionable, removing it seems the sensible course of action,
especially considering the simplifications this allows elsewhere
with the bit cache size increasing from 17 to 25 bits as minimum.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 938f72e1)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 2b39962e)

remove the trivial function do_switch_stream as it doesn't help to make
the code easier to understand.
(cherry picked from commit 305ca590)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 3b924294)

Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 6eabb0d3)

Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit fcb7e535)

Don't free RBSP tables (containing decoded NAL units) on resolution
change, because we actually need this data to decode the frame after
reiniting (with new resolution). Fixed issue 2393.
Signed-off-by: Janne Grunau <janne-ffmpeg@jannau.net>
(cherry picked from commit 91078926)

C99 variadic macros require more arguments than there are named
parameters in the definition.  This means we must use an extra
indirection to avoid having two different macros for arrays with
one resp more than one dimension.
Signed-off-by: Mans Rullgard <mans@mansr.com>
(cherry picked from commit 96aad41e)