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

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

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

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

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

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

* qatar/master:
  rtpdec: Remove an outdated todo comment
  rtpdec: Rename a static variable to normal naming conventions
  sh4: dsputil: remove duplicate of ff_gmc_c()
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

These tags describe the product and quicktime library version respectively.
Originate from Adobe Premier, but some other products use them.

This comment was added in e309128f, in 2002, and has been brought
along since then more or less unmodified.

The first point of the todo was implemented in dbf30963 in 2006,
the second one is not relevant to rtpdec.c (brought along from
rtp.c in 8eb793c4 in 2008) but would be more relevant to the
rtp muxer, although it isn't a good idea anyway.
Signed-off-by: NMartin Storsjö <martin@martin.st>

Signed-off-by: NMartin Storsjö <martin@martin.st>

This function is an exact duplicate of the generic one.
Signed-off-by: NMans Rullgard <mans@mansr.com>

This fixes potentially exploitable out of array writes.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

* qatar/master:
  dsputil: remove unused macro WRAPPER8_16
  configure: fix automatic processing of _extralibs in check_deps
  libvpxenc: Support forcing keyframes
  ac3dec: decode directly into output buffers

Conflicts:
	libavcodec/ac3dec.c
	libavcodec/libvpxenc.c
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit '30b39164':
  ac3dec: make downmix() take array of pointers to channel data

Conflicts:
	libavcodec/ac3dsp.c
	libavcodec/ac3dsp.h
Merged-by: NMichael Niedermayer <michaelni@gmx.at>

* commit 'b8f3ab8e':
  ac3dec: output planar float only
  svq3: make slice type value unsigned to match svq3_get_ue_golomb return type
  configure: Have protocols select network code instead of depending on it

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

* commit '5d471b73':
  rtpdec: K&R formatting and spelling cosmetics
  cosmetics: Fix dropable --> droppable typo

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

This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.
Signed-off-by: NMans Rullgard <mans@mansr.com>

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

Fix Ticket1986
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

This macro has never been used.
Signed-off-by: NMans Rullgard <mans@mansr.com>

Mostly cosmetics changes, but also makes
decoding little faster here.
Signed-off-by: NPaul B Mahol <onemda@gmail.com>

This fixes the automatic use of $foo_extralibs when feature foo
is enabled indirectly through a _select or _suggest.
Signed-off-by: NMans Rullgard <mans@mansr.com>

The code should not assert in case of invalid user input. Fails
gracefully instead.

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

This fixes passing fields instead of frames into the decoder.
Signed-off-by: NMichael Niedermayer <michaelni@gmx.at>

Signed-off-by: NMartin Storsjö <martin@martin.st>

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

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

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

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

Signed-off-by: NMans Rullgard <mans@mansr.com>

Signed-off-by: NMans Rullgard <mans@mansr.com>

* qatar/master:
  avio: K&R cosmetic formatting

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