mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-02-04 06:08:26 +02:00
all: Replace __FUNCTION__ by __func__
Only the latter is valid ISO C. Reviewed-by: James Almer <jamrial@gmail.com> Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
parent
8ba7deb6c0
commit
e999a09f19
@ -152,7 +152,7 @@ typedef struct FFOpenGLFunctions {
|
||||
{\
|
||||
GLenum err_code; \
|
||||
if ((err_code = glGetError()) != GL_NO_ERROR) { \
|
||||
av_log(ctx, AV_LOG_ERROR, "OpenGL error occurred in '%s', line %d: %d\n", __FUNCTION__, __LINE__, err_code); \
|
||||
av_log(ctx, AV_LOG_ERROR, "OpenGL error occurred in '%s', line %d: %d\n", __func__, __LINE__, err_code); \
|
||||
goto fail; \
|
||||
} \
|
||||
}\
|
||||
|
@ -274,7 +274,7 @@ static int decode_fctl_chunk(AVFormatContext *s, APNGDemuxContext *ctx, AVPacket
|
||||
"delay_den: %"PRIu16", "
|
||||
"dispose_op: %d, "
|
||||
"blend_op: %d\n",
|
||||
__FUNCTION__,
|
||||
__func__,
|
||||
sequence_number,
|
||||
width,
|
||||
height,
|
||||
|
@ -2533,7 +2533,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||
if (codec && !avctx->codec)
|
||||
if (avcodec_open2(avctx, codec, options ? &options[i] : &thread_opt) < 0)
|
||||
av_log(ic, AV_LOG_WARNING,
|
||||
"Failed to open codec in %s\n",__FUNCTION__);
|
||||
"Failed to open codec in %s\n", __func__);
|
||||
}
|
||||
if (!options)
|
||||
av_dict_free(&thread_opt);
|
||||
@ -2790,7 +2790,7 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||
av_dict_set(&opts, "codec_whitelist", ic->codec_whitelist, 0);
|
||||
if (avcodec_open2(avctx, codec, (options && stream_index < orig_nb_streams) ? &options[stream_index] : &opts) < 0)
|
||||
av_log(ic, AV_LOG_WARNING,
|
||||
"Failed to open codec in %s\n",__FUNCTION__);
|
||||
"Failed to open codec in %s\n", __func__);
|
||||
av_dict_free(&opts);
|
||||
}
|
||||
}
|
||||
|
@ -1120,7 +1120,7 @@ static int write_packet_common(AVFormatContext *s, AVStream *st, AVPacket *pkt,
|
||||
int ret;
|
||||
|
||||
if (s->debug & FF_FDEBUG_TS)
|
||||
av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __FUNCTION__,
|
||||
av_log(s, AV_LOG_DEBUG, "%s size:%d dts:%s pts:%s\n", __func__,
|
||||
pkt->size, av_ts2str(pkt->dts), av_ts2str(pkt->pts));
|
||||
|
||||
guess_pkt_duration(s, st, pkt);
|
||||
|
Loading…
x
Reference in New Issue
Block a user