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

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

The functions are unused
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

Signed-off-by: Paul B Mahol <onemda@gmail.com>

* qatar/master:
  altivec: perform an explicit unaligned load
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9d86bfc2':
  hlsenc: Don't reset the number variable when wrapping

Conflicts:
	libavformat/hlsenc.c

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

* commit '09c93b1b':
  hlsenc: Append the last incomplete segment when closing the output

Conflicts:
	libavformat/hlsenc.c

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

* commit 'c9031c7c':
  hlsenc: Add a proper dependency on the mpegts muxer

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

* commit '239f55bf':
  vp56data: Move all data tables to the .c file
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'cb214707':
  vp56data: Move all shared enum/struct declarations to common header
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '38f64c03':
  mpeg12decdata.h: Move all tables to the only place they are used

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

* commit 'ec6c1b1d':
  mpeg12decdata: Remove unused #define
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'c591d457':
  avcodec: Replace local extern declarations for tables with header #includes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'aa2ba8c9':
  swscale: Move extern declarations for tables to swscale_internal.h

Conflicts:
	libswscale/output.c
	libswscale/swscale_internal.h
	libswscale/swscale_unscaled.c
	libswscale/utils.c
	libswscale/yuv2rgb.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd2585315':
  swscale: Mark a bunch of tables only used within one file static

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

* commit '060ce0c6':
  ivi_common: Make some tables only used within the file static
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4b054a34':
  rtpproto: Check the right feature detection macro
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '163a7297':
  electronicarts: Let functions always returning the same value return void
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '4908c8ef':
  electronicarts: Improve some function/variable names

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

* commit 'a90cff13':
  electronicarts: comment wording fixes
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '288f2ffb':
  electronicarts: Remove bogus function documentation
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '8747fce9':
  electronicarts: K&R formatting cosmetics

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

* commit 'e8c0defe':
  8bps: decode 24bit files correctly as rgb32 on bigendian

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

Implicit vector loads on POWER7 hardware can use the VSX
instruction set instead of classic Altivec/VMX. Let's force
a VMX load in this case.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

With this all AVOptions from swscale can be set without each needing
changes to vf_scale.c
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

The counter itself shouldn't be wrapped, since it is used for
determining end_pts for the next segment - only wrap the number
used for the segment file name.
Signed-off-by: Martin Storsjö <martin@martin.st>

Also avoid comparing NOPTS values.

Bug-id: 551
Signed-off-by: Martin Storsjö <martin@martin.st>

The hls muxer itself doesn't have any direct (object file level)
dependencies on mpegtsenc.o, and including that object file
directly doesn't ensure that it is registered so that the muxer
actually is accessible.
Signed-off-by: Martin Storsjö <martin@martin.st>

This allows specifying more dither algorithms without using up flags and
without ambiguities.

Also initialize the new field based on the flags and use it.
Note, improving the logic of the checks is left to subsequent
commits, this here only switches from flags to enum.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

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