ffmpeg | branch: master | Clément Bœsch <[email protected]> | Sat Apr 1 11:26:23 2017 +0200| [52e6fb9c597fe0d741f939c31a692362f4ea3136] | committer: Clément Bœsch
Merge commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56' * commit 'f7407f56cbf820a147bd77d728ac9a72c587cc56': golomb: Replace __PRETTY_FUNCTION__ with __func__ for tracing Merged-by: Clément Bœsch <[email protected]> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=52e6fb9c597fe0d741f939c31a692362f4ea3136 --- libavcodec/golomb.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/golomb.h b/libavcodec/golomb.h index 513d652..47b369f 100644 --- a/libavcodec/golomb.h +++ b/libavcodec/golomb.h @@ -448,10 +448,10 @@ static inline int get_te(GetBitContext *s, int r, char *file, const char *func, return i; } -#define get_ue_golomb(a) get_ue(a, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_se_golomb(a) get_se(a, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_te_golomb(a, r) get_te(a, r, __FILE__, __PRETTY_FUNCTION__, __LINE__) -#define get_te0_golomb(a, r) get_te(a, r, __FILE__, __PRETTY_FUNCTION__, __LINE__) +#define get_ue_golomb(a) get_ue(a, __FILE__, __func__, __LINE__) +#define get_se_golomb(a) get_se(a, __FILE__, __func__, __LINE__) +#define get_te_golomb(a, r) get_te(a, r, __FILE__, __func__, __LINE__) +#define get_te0_golomb(a, r) get_te(a, r, __FILE__, __func__, __LINE__) #endif /* TRACE */ ====================================================================== _______________________________________________ ffmpeg-cvslog mailing list [email protected] http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
