MyFavMirrors/owntone-server
1
0
Fork 0
mirror of https://github.com/owntone/owntone-server.git synced 2024-12-30 09:03:23 -05:00
Code Issues Packages Projects Releases Wiki Activity

[transcode] More adjustments for libav 12

Browse Source
This commit is contained in:
ejurgensen 2017-03-04 09:40:29 +01:00
parent 6951639d24
commit f9375ef915
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/transcode.c
View File

@ -33,8 +33,8 @@
#include <libavutil/opt.h> #include <libavutil/opt.h>
#include <libavutil/time.h> #include <libavutil/time.h>
#include <libavutil/pixdesc.h> #include <libavutil/pixdesc.h>
#include <libavutil/channel_layout.h>
#include "ffmpeg-compat.h" #include <libavutil/mathematics.h>
#include "logger.h" #include "logger.h"
#include "conffile.h" #include "conffile.h"
@ -827,18 +827,22 @@ close_input(struct decode_ctx *ctx)
static int static int
open_output(struct encode_ctx *ctx, struct decode_ctx *src_ctx) open_output(struct encode_ctx *ctx, struct decode_ctx *src_ctx)
{ {
AVOutputFormat *oformat;
int ret; int ret;
ctx->ofmt_ctx = NULL; oformat = av_guess_format(ctx->settings.format, NULL, NULL);
avformat_alloc_output_context2(&ctx->ofmt_ctx, NULL, ctx->settings.format, NULL); if (!oformat)
if (!ctx->ofmt_ctx)
{ {
DPRINTF(E_LOG, L_XCODE, "Could not create output context\n"); DPRINTF(E_LOG, L_XCODE, "ffmpeg/libav could not find the '%s' output format\n", ctx->settings.format);
return -1; return -1;
} }
// Clear AVFMT_NOFILE bit, it is not allowed as we will set our own AVIOContext // Clear AVFMT_NOFILE bit, it is not allowed as we will set our own AVIOContext
ctx->ofmt_ctx->oformat->flags = ~AVFMT_NOFILE; oformat->flags = ~AVFMT_NOFILE;
CHECK_NULL(L_XCODE, ctx->ofmt_ctx = avformat_alloc_context());
ctx->ofmt_ctx->oformat = oformat;
ctx->obuf = evbuffer_new(); ctx->obuf = evbuffer_new();
if (!ctx->obuf) if (!ctx->obuf)