Merge remote-tracking branch 'qatar/master'

* 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>

1 files changed, 6 insertions, 6 deletions

diff --git a/libavformat/tls.c b/libavformat/tls.c
index bd73febd4d..8211e88846 100644
--- a/libavformat/tls.c
+++ b/libavformat/tls.c
@@ -73,7 +73,7 @@ static int do_tls_poll(URLContext *h, int ret)
     struct pollfd p = { c->fd, 0, 0 };
 #if CONFIG_GNUTLS
     if (ret != GNUTLS_E_AGAIN && ret != GNUTLS_E_INTERRUPTED) {
-        av_log(NULL, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret));
+        av_log(h, AV_LOG_ERROR, "%s\n", gnutls_strerror(ret));
         return AVERROR(EIO);
     }
     if (gnutls_record_get_direction(c->session))
@@ -87,11 +87,11 @@ static int do_tls_poll(URLContext *h, int ret)
     } else if (ret == SSL_ERROR_WANT_WRITE) {
         p.events = POLLOUT;
     } else {
-        av_log(NULL, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
+        av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
         return AVERROR(EIO);
     }
 #endif
-    if (h->flags & URL_FLAG_NONBLOCK)
+    if (h->flags & AVIO_FLAG_NONBLOCK)
         return AVERROR(EAGAIN);
     while (1) {
         int n = poll(&p, 1, 100);
@@ -148,13 +148,13 @@ static int tls_open(URLContext *h, const char *uri, int flags)
 #elif CONFIG_OPENSSL
     c->ctx = SSL_CTX_new(SSLv3_client_method());
     if (!c->ctx) {
-        av_log(NULL, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
+        av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
         ret = AVERROR(EIO);
         goto fail;
     }
     c->ssl = SSL_new(c->ctx);
     if (!c->ssl) {
-        av_log(NULL, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
+        av_log(h, AV_LOG_ERROR, "%s\n", ERR_error_string(ERR_get_error(), NULL));
         ret = AVERROR(EIO);
         goto fail;
     }
@@ -166,7 +166,7 @@ static int tls_open(URLContext *h, const char *uri, int flags)
         if (ret > 0)
             break;
         if (ret == 0) {
-            av_log(NULL, AV_LOG_ERROR, "Unable to negotiate TLS/SSL session\n");
+            av_log(h, AV_LOG_ERROR, "Unable to negotiate TLS/SSL session\n");
             ret = AVERROR(EIO);
             goto fail;
         }