virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-10 06:10:52 +02:00
Code Issues Releases Activity

avcodec/libdcadec: require first public release

Browse Source 
Reviewed-by: Hendrik Leppkes <h.leppkes@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
This commit is contained in:
James Almer
2015-11-27 15:08:44 -03:00
parent 26a84e2dae
commit 27ce53b52d
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@@ -1883,7 +1883,6 @@ TYPES_LIST="
CONDITION_VARIABLE_Ptr CONDITION_VARIABLE_Ptr
socklen_t socklen_t
struct_addrinfo struct_addrinfo
struct_dcadec_exss_info_matrix_encoding
struct_group_source_req struct_group_source_req
struct_ip_mreq_source struct_ip_mreq_source
struct_ipv6_mreq struct_ipv6_mreq
@@ -5348,8 +5347,7 @@ enabled libcelt && require libcelt celt/celt.h celt_decode -lcelt0 &&
{ check_lib celt/celt.h celt_decoder_create_custom -lcelt0 || { check_lib celt/celt.h celt_decoder_create_custom -lcelt0 ||
die "ERROR: libcelt must be installed and version must be >= 0.11.0."; } die "ERROR: libcelt must be installed and version must be >= 0.11.0."; }
enabled libcaca && require_pkg_config caca caca.h caca_create_canvas enabled libcaca && require_pkg_config caca caca.h caca_create_canvas
enabled libdcadec && require_pkg_config dcadec libdcadec/dca_context.h dcadec_context_create && enabled libdcadec && require_pkg_config "dcadec >= 0.1.0" libdcadec/dca_context.h dcadec_context_create
check_struct libdcadec/dca_context.h "struct dcadec_exss_info" matrix_encoding
enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac enabled libfaac && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaac
enabled libfdk_aac && { use_pkg_config fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen || enabled libfdk_aac && { use_pkg_config fdk-aac "fdk-aac/aacenc_lib.h" aacEncOpen ||
{ require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac && { require libfdk_aac fdk-aac/aacenc_lib.h aacEncOpen -lfdk-aac &&

6
libavcodec/libdcadec.c
View File

@@ -42,7 +42,7 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
{ {
DCADecContext *s = avctx->priv_data; DCADecContext *s = avctx->priv_data;
AVFrame *frame = data; AVFrame *frame = data;
av_unused struct dcadec_exss_info *exss; struct dcadec_exss_info *exss;
int ret, i, k; int ret, i, k;
int **samples, nsamples, channel_mask, sample_rate, bits_per_sample, profile; int **samples, nsamples, channel_mask, sample_rate, bits_per_sample, profile;
uint32_t mrk; uint32_t mrk;
@@ -78,6 +78,8 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
&sample_rate, &bits_per_sample, &profile)) < 0) { &sample_rate, &bits_per_sample, &profile)) < 0) {
av_log(avctx, AV_LOG_ERROR, "dcadec_context_filter() failed: %d (%s)\n", -ret, dcadec_strerror(ret)); av_log(avctx, AV_LOG_ERROR, "dcadec_context_filter() failed: %d (%s)\n", -ret, dcadec_strerror(ret));
return AVERROR_EXTERNAL; return AVERROR_EXTERNAL;
} else if (ret > 0) {
av_log(avctx, AV_LOG_WARNING, "dcadec_context_filter() warning: %d (%s)\n", ret, dcadec_strerror(ret));
} }
avctx->channels = av_get_channel_layout_nb_channels(channel_mask); avctx->channels = av_get_channel_layout_nb_channels(channel_mask);
@@ -129,7 +131,6 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
} else } else
avctx->bit_rate = 0; avctx->bit_rate = 0;
#if HAVE_STRUCT_DCADEC_EXSS_INFO_MATRIX_ENCODING
if (exss = dcadec_context_get_exss_info(s->ctx)) { if (exss = dcadec_context_get_exss_info(s->ctx)) {
enum AVMatrixEncoding matrix_encoding = AV_MATRIX_ENCODING_NONE; enum AVMatrixEncoding matrix_encoding = AV_MATRIX_ENCODING_NONE;
@@ -158,7 +159,6 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data,
(ret = ff_side_data_update_matrix_encoding(frame, matrix_encoding)) < 0) (ret = ff_side_data_update_matrix_encoding(frame, matrix_encoding)) < 0)
return ret; return ret;
} }
#endif
frame->nb_samples = nsamples; frame->nb_samples = nsamples;
if ((ret = ff_get_buffer(avctx, frame, 0)) < 0) if ((ret = ff_get_buffer(avctx, frame, 0)) < 0)