diff options
| author | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
|---|---|---|
| committer | Mathieu Arnold <mat@FreeBSD.org> | 2016-07-26 16:51:15 +0000 |
| commit | 9fa9eb9ac7bf1d3de825ee25a8f0ae81b7b77896 (patch) | |
| tree | 9b071a8105704e992946dcd6b801e9fcb7635142 /audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c | |
| parent | MooseFS is a Fault tolerant, High Available, Highly Performing, Scale-Out, (diff) | |
Cleanup patches, a* categories.
Rename them to follow the make makepatch naming, and regenerate them.
With hat: portmgr
Sponsored by: Absolight
Diffstat (limited to 'audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c')
| -rw-r--r-- | audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c | 50 |
1 files changed, 50 insertions, 0 deletions
diff --git a/audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c b/audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c new file mode 100644 index 000000000000..003a3c18b211 --- /dev/null +++ b/audio/deadbeef/files/patch-plugins_ffmpeg_ffmpeg.c @@ -0,0 +1,50 @@ +--- plugins/ffmpeg/ffmpeg.c.orig 2016-04-24 21:38:13 UTC ++++ plugins/ffmpeg/ffmpeg.c +@@ -26,20 +26,11 @@ + #include "../../deadbeef.h" + #include "../../strdupa.h" + +-#if !FFMPEG_OLD +- + #include <libavformat/avformat.h> + #include <libavcodec/avcodec.h> + #include <libavutil/avutil.h> + #include <libavutil/avstring.h> + +-#else +- +-#include <ffmpeg/avformat.h> +-#include <ffmpeg/avcodec.h> +-#include <ffmpeg/avutil.h> +-#include <ffmpeg/avstring.h> +- + #define AVERROR_EOF AVERROR(EPIPE) + + #if LIBAVFORMAT_VERSION_MAJOR < 53 +@@ -50,8 +41,6 @@ + #define AV_VERSION_INT(a, b, c) (a<<16 | b<<8 | c) + #endif + +-#endif +- + #if LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(54, 6, 0) + #define av_find_stream_info(ctx) avformat_find_stream_info(ctx,NULL) + #define avcodec_open(ctx,codec) avcodec_open2(ctx,codec,NULL) +@@ -260,7 +249,7 @@ ffmpeg_init (DB_fileinfo_t *_info, DB_pl + _info->fmt.bps = bps; + _info->fmt.channels = info->ctx->channels; + _info->fmt.samplerate = samplerate; +- if (info->ctx->sample_fmt == AV_SAMPLE_FMT_FLT || info->ctx->sample_fmt == AV_SAMPLE_FMT_FLTP) { ++ if (info->ctx->sample_fmt == AV_SAMPLE_FMT_FLT) { + _info->fmt.is_float = 1; + } + +@@ -332,7 +321,7 @@ ffmpeg_read (DB_fileinfo_t *_info, char + _info->fmt.channels = info->ctx->channels; + _info->fmt.samplerate = info->ctx->sample_rate; + _info->fmt.bps = av_get_bits_per_sample_format (info->ctx->sample_fmt); +- _info->fmt.is_float = (info->ctx->sample_fmt == AV_SAMPLE_FMT_FLT || info->ctx->sample_fmt == AV_SAMPLE_FMT_FLTP); ++ _info->fmt.is_float = (info->ctx->sample_fmt == AV_SAMPLE_FMT_FLT); + + int samplesize = _info->fmt.channels * _info->fmt.bps / 8; + |