* commit '7c1e2e64':
  rtpenc_xiph: Use AV_WB16 instead of manual bitshifts

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

* commit 'd16c8d28':
  rtpenc_aac: Use AV_WB16 instead of manual bitshifts
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '9c9b0218':
  rtpenc_aac: Merge a definition with a declaration
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '1fc64e2e':
  rtpenc: Write conditional statements on separate lines
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '0662440b':
  rtpenc_aac: Set a default value for max_frames_per_packet at init
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '12b34599':
  rtpenc_amr: Use s->num_frames instead of s->buf_ptr - s->buf
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '98563953':
  rtpenc_aac: Fix sending fragmented frames
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '990e4a66':
  Add a QSV decoding example.

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

* commit 'ea1d0b7e':
  avcodec/utils: use correct printf specifier in ff_set_sar

See: 732c3ebfMerged-by: Michael Niedermayer <michaelni@gmx.at>

* commit '802987f8':
  x11grab: Unbreak building

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

* commit '71f1ad37':
  lavc: do not compile fmtconvert unconditionally

Conflicts:
	configure
	libavcodec/ppc/Makefile
	libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'd74a8cb7':
  fmtconvert: drop unused functions

Conflicts:
	libavcodec/arm/fmtconvert_vfp_armv6.S
	libavcodec/x86/fmtconvert.asm
	libavcodec/x86/fmtconvert_init.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'ee964145':
  lavc: remove unused traces of fmtconvert usage

Conflicts:
	libavcodec/aac.h
	libavcodec/aacdec.c
	libavcodec/atrac3.c
	libavcodec/vorbisdec.c
	libavcodec/wma.c
	libavcodec/wma.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>

* commit 'b9d2d684':
  tls: Pass AVOptions dictionaries through to the chained protocol

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

* commit 'e14f98c6':
  tcp: Clarify the units for the timeout avoptions

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

* commit 'c86d8aed':
  avio: Rename avclass symbols relating to avio
Merged-by: Michael Niedermayer <michaelni@gmx.at>

flags is later written with avio_w8 and if it doesn't fit in one byte it
triggers an av_assert2.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

These could trigger assert failures previously
Found-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

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

This makes the code slightly more readable and understandable.
Signed-off-by: Martin Storsjö <martin@martin.st>

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

Intentionally keeping some conditional statements on single lines
in rtpenc_h263.c.
Signed-off-by: Martin Storsjö <martin@martin.st>

This avoids having to conditionally set the default within the
packetizer function.
Signed-off-by: Martin Storsjö <martin@martin.st>

This doesn't fix any bug, but makes the code simpler for later
patches, and more straightforward to read as is.
Signed-off-by: Martin Storsjö <martin@martin.st>

After sending a fragmented frame, len (s->buf_ptr - s->buf) isn't
zero, while s->num_frames is zero as intended. Using s->num_frames
makes it work as intended, and is less convoluted than keeping track
of (resetting) s->buf_ptr.

This avoids sending stray data after sending a fragmented aac packet.

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

Signed-off-by: Andreas Cadhalpun <Andreas.Cadhalpun@googlemail.com>
Signed-off-by: Anton Khirnov <anton@khirnov.net>

The correct macro is DEC not D. Broken in
b31328d0Signed-off-by: Anton Khirnov <anton@khirnov.net>

Only ac3dec and dcadec use it.

Those decoders have been switched to float output and so do not use
fmtconvert anymore.

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

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

Don't prefix them ffio_url, which is misleading, sounding too
much like the urlprotocol layer (like ffurl_*).
Signed-off-by: Martin Storsjö <martin@martin.st>

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

9127 -> 8936 decicycles (fate-suite/vc1/SA10143.vc1)
13855 -> 10976 decicycles  (fate-suite/vc1/SA20021.vc1)
tests done by the author over this function but with the whole
patchset applied not just this commit
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>