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>

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

(cherry picked from commit 9ebc93fa4623791eca9efeee4de65b23dc015de1)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit 69bca779e5d8409cde336406a26b5173002cac97)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit 9e2ccb2de8d4dc5179cd86610b129500e6223be7)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit 257e5c4829cd916938c9e1922e50668636346f71)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit 17219c79360bc2bdaf3e7f47178af42fade140a8)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit 83e31db195b9d0a07b0526eab5780817d8ce9444)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit c56313aa7969691f1a779e5ac5666f012676836f)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit 2d6ca09c0f6ea318e439b9b073f507c802623ced)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit a7820f3c5a0f4d2a5f005f9ca3766d29b2111380)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit 6b05ea8b690ecab0e98924f0887f24311843d080)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit d34e3cf342219e9825125d4f9327cf1feab15c79)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

(cherry picked from commit 3197968bedf9f0d6d3cccf11cfbd19c23063493b)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>

* qatar/master: (29 commits)
  doc: update libavfilter documentation
  tls: Use the URLContext as logging context
  aes: Avoid illegal read and don't generate more key than we use.
  mpc7: Fix memset call in mpc7_decode_frame function
  atrac1: use correct context for av_log()
  apedec: consume the whole packet when copying to the decoder buffer.
  apedec: do not needlessly copy s->samples to nblocks.
  apedec: check output buffer size after calculating actual output size
  apedec: remove unneeded entropy decoder normalization.
  truespeech: use memmove() in truespeech_update_filters()
  vorbisdec: remove AVCODEC_MAX_AUDIO_FRAME_SIZE check
  vorbisdec: remove unneeded buf_size==0 check
  vorbisdec: return proper error codes instead of made-up ones
  http: Don't add a Range: bytes=0- header for POST
  sunrast: Check for invalid/corrupted bitstream
  http: Change the chunksize AVOption into chunked_post
  http: Add encoding/decoding flags to the AVOptions
  avconv: remove some codec-specific hacks
  crypto: add decoding flag to options.
  tls: use AVIO_FLAG_NONBLOCK instead of deprecated URL_FLAG_NONBLOCK
  ...

Conflicts:
	doc/libavfilter.texi
	libavcodec/atrac1.c
	libavcodec/sunrast.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Update the reference to the conversion tool to use avconv and
make sure the example line works as supposed.
Remove the paragraph pointing to the svn repo

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

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

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

Fixes ticket #632.

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

This avoids artifically consuming a partial packet but ignoring remaining data
in subsequent calls.

also move nblocks to the local scope where it is used.

The decoder already skips data at the end of the packet without this.
Also remove 2 APEContext fields that were only used for the end-of-frame
normalization.

The user could provide a larger buffer, which is already checked separately
before writing output.

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