Skip to content

M
mpd
Commit 82700430 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Revert "decoder/ffmpeg: copy the AVPacket in ffmpeg_send_packet()"

This reverts commit eb192137. This is no longer necessary because we require FFmpeg 3.1 or newer since MPD 0.21.2. This fixes a deprecation warning because the implicit AVPacket copy constructor copies the deprecated attribute `convergence_duration`.
parent c00ce42b
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 19 deletions
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View file @ 82700430
......@@ -297,7 +297,7 @@ FfmpegReceiveFrames(DecoderClient &client, InputStream &is,
*/
static DecoderCommand
ffmpeg_send_packet(DecoderClient &client, InputStream &is,
AVPacket &&packet,
const AVPacket &packet,
AVCodecContext &codec_context,
const AVStream &stream,
AVFrame &frame,
......@@ -350,24 +350,6 @@ ffmpeg_send_packet(DecoderClient &client, InputStream &is,
return cmd;
}
static DecoderCommand
ffmpeg_send_packet(DecoderClient &client, InputStream &is,
const AVPacket &packet,
AVCodecContext &codec_context,
const AVStream &stream,
AVFrame &frame,
uint64_t min_frame, size_t pcm_frame_size,
FfmpegBuffer &buffer)
{
return ffmpeg_send_packet(client, is,
/* copy the AVPacket, because FFmpeg
< 3.0 requires this */
AVPacket(packet),
codec_context, stream,
frame, min_frame, pcm_frame_size,
buffer);
}
gcc_const
static SampleFormat
ffmpeg_sample_format(enum AVSampleFormat sample_fmt) noexcept
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment