diff options
Diffstat (limited to 'src/codec')
| -rw-r--r-- | src/codec/ffmpeg/common.h | 2 | ||||
| -rw-r--r-- | src/codec/ffmpeg/decoder.c | 4 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/codec/ffmpeg/common.h b/src/codec/ffmpeg/common.h index 26f807d..c40a38d 100644 --- a/src/codec/ffmpeg/common.h +++ b/src/codec/ffmpeg/common.h @@ -4,6 +4,8 @@ #include <libavutil/frame.h> #include <libavcodec/avcodec.h> +#define camu_ff_longest_name(desc) ((desc)->long_name ? (desc)->long_name : (desc)->name) + s64 camu_ff_frame_duration(AVFrame *frame); // userdata, level, fmt, args diff --git a/src/codec/ffmpeg/decoder.c b/src/codec/ffmpeg/decoder.c index 3da0027..d24677a 100644 --- a/src/codec/ffmpeg/decoder.c +++ b/src/codec/ffmpeg/decoder.c @@ -28,7 +28,7 @@ static const char *hwdevices[] = { static void log_codec_name(const AVCodec *codec, const char *hwdevice_name) { - const char *name = codec->long_name ? codec->long_name : codec->name; + const char *name = camu_ff_longest_name(codec); if (hwdevice_name) { log_info("Codec: %s (via %s hwaccel).", name, hwdevice_name); } else { @@ -141,6 +141,8 @@ static s32 init_hwdevice_context(struct camu_ff_decoder *av, AVCodecContext *con #ifdef CAMU_HUGE_VIDEO_BUFFER // Note that context->extra_hw_frames has the ability to cause corruption. context->extra_hw_frames = 48; +#else + context->extra_hw_frames = 4; #endif return ret; |