[FFmpeg-cvslog] Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Mar 31 16:38:37 2017 -0300| [b725b482c6af996cb1922c48c3b32c3a6e857ea1] | committer: James Almer

Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'

* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6':
  Drop pointless void* casts

Merged-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b725b482c6af996cb1922c48c3b32c3a6e857ea1
---

 libavcodec/flac_parser.c     | 2 +-
 libavcodec/libopenh264enc.c  | 4 ++--
 libavcodec/libschroedinger.c | 2 +-
 libavcodec/vdpau.c           | 2 +-
 libavformat/avisynth.c       | 3 +--
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/libavcodec/flac_parser.c b/libavcodec/flac_parser.c
index e69f1d7..84da23f 100644
--- a/libavcodec/flac_parser.c
+++ b/libavcodec/flac_parser.c
@@ -640,7 +640,7 @@ static int flac_parse(AVCodecParserContext *s, AVCodecContext *avctx,
                                   read_end - read_start, NULL);
         } else {
             int8_t pad[MAX_FRAME_HEADER_SIZE] = { 0 };
-            av_fifo_generic_write(fpc->fifo_buf, (void*) pad, sizeof(pad), NULL);
+            av_fifo_generic_write(fpc->fifo_buf, pad, sizeof(pad), NULL);
         }
 
         /* Tag headers and update sequences. */
diff --git a/libavcodec/libopenh264enc.c b/libavcodec/libopenh264enc.c
index 648f59b..9c22bf4 100644
--- a/libavcodec/libopenh264enc.c
+++ b/libavcodec/libopenh264enc.c
@@ -112,10 +112,10 @@ static av_cold int svc_encode_init(AVCodecContext *avctx)
 
     // Set the logging callback function to one that uses av_log() (see implementation above).
     callback_function = (WelsTraceCallback) ff_libopenh264_trace_callback;
-    (*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK, (void *)&callback_function);
+    (*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK, &callback_function);
 
     // Set the AVCodecContext as the libopenh264 callback context so that it can be passed to av_log().
-    (*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK_CONTEXT, (void *)&avctx);
+    (*s->encoder)->SetOption(s->encoder, ENCODER_OPTION_TRACE_CALLBACK_CONTEXT, &avctx);
 
     (*s->encoder)->GetDefaultParams(s->encoder, &param);
 
diff --git a/libavcodec/libschroedinger.c b/libavcodec/libschroedinger.c
index 0b02b2c..4bb0f12 100644
--- a/libavcodec/libschroedinger.c
+++ b/libavcodec/libschroedinger.c
@@ -199,7 +199,7 @@ SchroFrame *ff_create_schro_frame(AVCodecContext *avctx,
     p_frame->format = schro_frame_fmt;
     p_frame->width  = y_width;
     p_frame->height = y_height;
-    schro_frame_set_free_callback(p_frame, free_schro_frame, (void *)p_pic);
+    schro_frame_set_free_callback(p_frame, free_schro_frame, p_pic);
 
     for (i = 0; i < 3; ++i) {
         p_frame->components[i].width  = i ? uv_width : y_width;
diff --git a/libavcodec/vdpau.c b/libavcodec/vdpau.c
index a232603..9c7804a 100644
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@ -350,7 +350,7 @@ FF_ENABLE_DEPRECATION_WARNINGS
         status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info,
                                 pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
     } else
-    status = vdctx->render(vdctx->decoder, surf, (void *)&pic_ctx->info,
+    status = vdctx->render(vdctx->decoder, surf, &pic_ctx->info,
                            pic_ctx->bitstream_buffers_used,
                            pic_ctx->bitstream_buffers);
 
diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c
index 514cb99..6d47571 100644
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@ -119,8 +119,7 @@ static av_cold int avisynth_load_library(void)
         return AVERROR_UNKNOWN;
 
 #define LOAD_AVS_FUNC(name, continue_on_fail)                          \
-        avs_library.name =                                             \
-            (void *)dlsym(avs_library.library, #name);                 \
+        avs_library.name = dlsym(avs_library.library, #name);          \
         if (!continue_on_fail && !avs_library.name)                    \
             goto fail;
 


======================================================================

diff --cc libavcodec/vdpau.c
index a232603,d3cb188..9c7804a
--- a/libavcodec/vdpau.c
+++ b/libavcodec/vdpau.c
@@@ -334,23 -267,7 +334,23 @@@ int ff_vdpau_common_end_frame(AVCodecCo
      if (val < 0)
          return val;
  
 +#if FF_API_BUFS_VDPAU
 +FF_DISABLE_DEPRECATION_WARNINGS
 +    if (hwctx) {
 +    av_assert0(sizeof(hwctx->info) <= sizeof(pic_ctx->info));
 +    memcpy(&hwctx->info, &pic_ctx->info, sizeof(hwctx->info));
 +    hwctx->bitstream_buffers = pic_ctx->bitstream_buffers;
 +    hwctx->bitstream_buffers_used = pic_ctx->bitstream_buffers_used;
 +    hwctx->bitstream_buffers_allocated = pic_ctx->bitstream_buffers_allocated;
 +    }
 +FF_ENABLE_DEPRECATION_WARNINGS
 +#endif
 +
 +    if (hwctx && !hwctx->render && hwctx->render2) {
 +        status = hwctx->render2(avctx, frame, (void *)&pic_ctx->info,
 +                                pic_ctx->bitstream_buffers_used, pic_ctx->bitstream_buffers);
 +    } else
-     status = vdctx->render(vdctx->decoder, surf, (void *)&pic_ctx->info,
+     status = vdctx->render(vdctx->decoder, surf, &pic_ctx->info,
                             pic_ctx->bitstream_buffers_used,
                             pic_ctx->bitstream_buffers);
  
diff --cc libavformat/avisynth.c
index 514cb99,7d5b139..6d47571
--- a/libavformat/avisynth.c
+++ b/libavformat/avisynth.c
@@@ -119,8 -118,7 +119,7 @@@ static av_cold int avisynth_load_librar
          return AVERROR_UNKNOWN;
  
  #define LOAD_AVS_FUNC(name, continue_on_fail)                          \
-         avs_library.name =                                             \
-             (void *)dlsym(avs_library.library, #name);                 \
 -        avs_library.name = GetProcAddress(avs_library.library, #name); \
++        avs_library.name = dlsym(avs_library.library, #name);          \
          if (!continue_on_fail && !avs_library.name)                    \
              goto fail;