Merge commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6'
authorJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:38:37 +0000 (16:38 -0300)
committerJames Almer <jamrial@gmail.com>
Fri, 31 Mar 2017 19:38:37 +0000 (16:38 -0300)
* commit '800d91d348c89fc8ca3fbec7696ab1ec8787acc6':
  Drop pointless void* casts

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavcodec/flac_parser.c
libavcodec/libopenh264enc.c
libavcodec/libschroedinger.c
libavcodec/vdpau.c
libavformat/avisynth.c

Simple merge
Simple merge
Simple merge
@@@ -334,23 -267,7 +334,23 @@@ int ff_vdpau_common_end_frame(AVCodecCo
      if (val < 0)
          return val;
  
-     status = vdctx->render(vdctx->decoder, surf, (void *)&pic_ctx->info,
 +#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, &pic_ctx->info,
                             pic_ctx->bitstream_buffers_used,
                             pic_ctx->bitstream_buffers);
  
@@@ -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;