mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-12-05 13:23:17 +00:00
eaeb587429
Add support for conditional compile options, add pulseaudio and ffmpeg4 support patches.
34 lines
1.2 KiB
Diff
34 lines
1.2 KiB
Diff
Index: decoder_plugins/ffmpeg/ffmpeg.c
|
|
===================================================================
|
|
--- /decoder_plugins/ffmpeg/ffmpeg.c (revisión: 2963)
|
|
+++ /decoder_plugins/ffmpeg/ffmpeg.c (copia de trabajo)
|
|
@@ -697,7 +697,7 @@
|
|
* FFmpeg/LibAV in use. For some versions this will be caught in
|
|
* *_find_stream_info() above and misreported as an unfound codec
|
|
* parameters error. */
|
|
- if (data->codec->capabilities & CODEC_CAP_EXPERIMENTAL) {
|
|
+ if (data->codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) {
|
|
decoder_error (&data->error, ERROR_FATAL, 0,
|
|
"The codec is experimental and may damage MOC: %s",
|
|
data->codec->name);
|
|
@@ -705,8 +705,8 @@
|
|
}
|
|
|
|
set_downmixing (data);
|
|
- if (data->codec->capabilities & CODEC_CAP_TRUNCATED)
|
|
- data->enc->flags |= CODEC_FLAG_TRUNCATED;
|
|
+ if (data->codec->capabilities & AV_CODEC_CAP_TRUNCATED)
|
|
+ data->enc->flags |= AV_CODEC_FLAG_TRUNCATED;
|
|
|
|
if (avcodec_open2 (data->enc, data->codec, NULL) < 0)
|
|
{
|
|
@@ -725,7 +725,7 @@
|
|
|
|
data->sample_width = sfmt_Bps (data->fmt);
|
|
|
|
- if (data->codec->capabilities & CODEC_CAP_DELAY)
|
|
+ if (data->codec->capabilities & AV_CODEC_CAP_DELAY)
|
|
data->delay = true;
|
|
data->seek_broken = is_seek_broken (data);
|
|
data->timing_broken = is_timing_broken (data->ic);
|