diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 20:56:49 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-09 20:58:03 +0100 |
| commit | 268d93172460f116d239c2cf815d7b2f495efb2d (patch) | |
| tree | 6648863bf756cd7820d36f61d03d24d7bf7f64af | |
| parent | 92b2404571bcdd294d6ef0e614eee55432e959a7 (diff) | |
| parent | e6f0bb65270be51ea43345a28f8e4b1a728f7d0e (diff) | |
| download | ffmpeg-268d93172460f116d239c2cf815d7b2f495efb2d.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ATRAC3+ decoder
Conflicts:
Changelog
configure
libavcodec/atrac3plus.c
libavcodec/atrac3plus.h
libavcodec/atrac3plus_data.h
libavcodec/atrac3plusdec.c
libavcodec/atrac3plusdsp.c
libavcodec/version.h
See: 2e1fb96af36348479e14aa85f445915ea09e70fa
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/atrac3plus.c | 1 | ||||
| -rw-r--r-- | libavcodec/atrac3plus.h | 2 | ||||
| -rw-r--r-- | libavcodec/atrac3plusdec.c | 5 | ||||
| -rw-r--r-- | libavcodec/atrac3plusdsp.c | 1 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
5 files changed, 9 insertions, 2 deletions
diff --git a/libavcodec/atrac3plus.c b/libavcodec/atrac3plus.c index 25c4f76014..08c90cde98 100644 --- a/libavcodec/atrac3plus.c +++ b/libavcodec/atrac3plus.c @@ -247,6 +247,7 @@ static int num_coded_units(GetBitContext *gb, Atrac3pChanParams *chan, * * @param[in,out] ctx ptr to the channel unit context * @param[in,out] chan ptr to the channel parameters + * @param[in] wtab_idx index of the table of weights * @param[in] avctx ptr to the AVCodecContext * @return result code: 0 = OK, otherwise - error code */ diff --git a/libavcodec/atrac3plus.h b/libavcodec/atrac3plus.h index 9171e6e411..1b001fae6d 100644 --- a/libavcodec/atrac3plus.h +++ b/libavcodec/atrac3plus.h @@ -202,7 +202,7 @@ void ff_atrac3p_generate_tones(Atrac3pChanUnitCtx *ch_unit, AVFloatDSPContext *f * @param[in] ch_index which channel to process * @param[in,out] sp ptr to channel spectrum to process * @param[in] rng_index indicates which RNG table to use - * @param[in] sb which subband to process + * @param[in] sb_num which subband to process */ void ff_atrac3p_power_compensation(Atrac3pChanUnitCtx *ctx, int ch_index, float *sp, int rng_index, int sb_num); diff --git a/libavcodec/atrac3plusdec.c b/libavcodec/atrac3plusdec.c index 51d7072374..545dbecc5d 100644 --- a/libavcodec/atrac3plusdec.c +++ b/libavcodec/atrac3plusdec.c @@ -135,6 +135,11 @@ static av_cold int atrac3p_decode_init(AVCodecContext *avctx) ATRAC3PContext *ctx = avctx->priv_data; int i, ch, ret; + if (!avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); + return AVERROR(EINVAL); + } + ff_atrac3p_init_vlcs(); avpriv_float_dsp_init(&ctx->fdsp, avctx->flags & CODEC_FLAG_BITEXACT); diff --git a/libavcodec/atrac3plusdsp.c b/libavcodec/atrac3plusdsp.c index f8624b567b..3522af1e5a 100644 --- a/libavcodec/atrac3plusdsp.c +++ b/libavcodec/atrac3plusdsp.c @@ -116,6 +116,7 @@ av_cold void ff_atrac3p_init_wave_synth(void) * @param[in] synth_param ptr to common synthesis parameters * @param[in] waves_info parameters for each sine wave * @param[in] envelope envelope data for all waves in a group + * @param[in] phase_shift flag indicates 180° phase shift * @param[in] reg_offset region offset for trimming envelope data * @param[out] out receives sythesized data */ diff --git a/libavcodec/version.h b/libavcodec/version.h index 643694733c..b27a8a6171 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 47 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |