oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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

Browse Source 
This reverts commit eb192137d6.

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`.
This commit is contained in:
Max Kellermann 2020-04-01 17:28:58 +02:00
parent c00ce42bca
commit 8270043053
1 changed files with 1 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/decoder/plugins/FfmpegDecoderPlugin.cxx
View File

@ -297,7 +297,7 @@ FfmpegReceiveFrames(DecoderClient &client, InputStream &is,
*/ */
static DecoderCommand static DecoderCommand
ffmpeg_send_packet(DecoderClient &client, InputStream &is, ffmpeg_send_packet(DecoderClient &client, InputStream &is,
AVPacket &&packet, const AVPacket &packet,
AVCodecContext &codec_context, AVCodecContext &codec_context,
const AVStream &stream, const AVStream &stream,
AVFrame &frame, AVFrame &frame,
@ -350,24 +350,6 @@ ffmpeg_send_packet(DecoderClient &client, InputStream &is,
return cmd; 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 gcc_const
static SampleFormat static SampleFormat
ffmpeg_sample_format(enum AVSampleFormat sample_fmt) noexcept ffmpeg_sample_format(enum AVSampleFormat sample_fmt) noexcept