vlc | branch: master | Tristan Matthews <[email protected]> | Tue Feb 9 11:24:48 2016 -0500| [ea705c609234ef2b197a7fe91c57db907a6920ce] | committer: Tristan Matthews
vpx: clean up error macro calls > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ea705c609234ef2b197a7fe91c57db907a6920ce --- modules/codec/vpx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/codec/vpx.c b/modules/codec/vpx.c index aee6b5f..09578bc 100644 --- a/modules/codec/vpx.c +++ b/modules/codec/vpx.c @@ -63,7 +63,7 @@ static void vpx_err_msg(vlc_object_t *this, struct vpx_codec_ctx *ctx, msg_Err(this, msg, error, detail); } -#define VPX_ERR(this, ctx, msg) vpx_err_msg(VLC_OBJECT(this), ctx, msg) +#define VPX_ERR(this, ctx, msg) vpx_err_msg(VLC_OBJECT(this), ctx, msg ": %s (%s)") /***************************************************************************** * decoder_sys_t: libvpx decoder descriptor @@ -107,7 +107,7 @@ static picture_t *Decode(decoder_t *dec, block_t **pp_block) if (err != VPX_CODEC_OK) { free(pkt_pts); - VPX_ERR(dec, ctx, "Failed to decode frame: %s (%s)"); + VPX_ERR(dec, ctx, "Failed to decode frame"); return NULL; } @@ -199,7 +199,7 @@ static int OpenDecoder(vlc_object_t *p_this) vp_version, vpx_codec_version_str(), vpx_codec_build_config()); if (vpx_codec_dec_init(&sys->ctx, iface, &deccfg, 0) != VPX_CODEC_OK) { - VPX_ERR(p_this, &sys->ctx, "Failed to initialize decoder: %s (%s)"); + VPX_ERR(p_this, &sys->ctx, "Failed to initialize decoder"); free(sys); return VLC_EGENERIC;; } _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
