diff options
| author | Diego Biurrun <diego@biurrun.de> | 2012-10-08 19:08:03 +0200 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2012-10-09 11:39:26 +0200 |
| commit | f75f4194d1ea4e5a0176b13452345eff87164416 (patch) | |
| tree | b8f943c9b7128ec61a19b3f378c3670ed9cb3a67 /libavcodec/aacdec.c | |
| parent | c136a813d77ed0c8698386d140990e9003d5d38c (diff) | |
| download | ffmpeg-f75f4194d1ea4e5a0176b13452345eff87164416.tar.gz | |
Restructure av_log_missing_feature message
Some invocations include a verb in the log message, others do not. Yet
av_log_missing_feature expects callers to provide a verb. Change the
function to include a verb instead and update the callers accordingly.
The result is a more natural function API and correct English in the
function invocations.
Diffstat (limited to 'libavcodec/aacdec.c')
| -rw-r--r-- | libavcodec/aacdec.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libavcodec/aacdec.c b/libavcodec/aacdec.c index 1c59ec5937..859414adc9 100644 --- a/libavcodec/aacdec.c +++ b/libavcodec/aacdec.c @@ -633,7 +633,7 @@ static int decode_ga_specific_config(AACContext *ac, AVCodecContext *avctx, int tags = 0; if (get_bits1(gb)) { // frameLengthFlag - av_log_missing_feature(avctx, "960/120 MDCT window is", 1); + av_log_missing_feature(avctx, "960/120 MDCT window", 1); return -1; } @@ -2323,7 +2323,7 @@ static int parse_adts_frame_header(AACContext *ac, GetBitContext *gb) size = avpriv_aac_parse_header(gb, &hdr_info); if (size > 0) { if (hdr_info.num_aac_frames != 1) { - av_log_missing_feature(ac->avctx, "More than one AAC RDB per ADTS frame is", 0); + av_log_missing_feature(ac->avctx, "More than one AAC RDB per ADTS frame", 0); return -1; } push_output_configuration(ac); @@ -2607,8 +2607,8 @@ static int latm_decode_audio_specific_config(struct LATMContext *latmctx, asclen = get_bits_left(gb); if (config_start_bit % 8) { - av_log_missing_feature(latmctx->aac_ctx.avctx, "audio specific " - "config not byte aligned.\n", 1); + av_log_missing_feature(latmctx->aac_ctx.avctx, + "Non-byte-aligned audio-specific config", 1); return AVERROR_INVALIDDATA; } if (asclen <= 0) @@ -2663,7 +2663,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, // numPrograms if (get_bits(gb, 4)) { // numPrograms av_log_missing_feature(latmctx->aac_ctx.avctx, - "multiple programs are not supported\n", 1); + "multiple programs", 1); return AVERROR_PATCHWELCOME; } @@ -2672,7 +2672,7 @@ static int read_stream_mux_config(struct LATMContext *latmctx, // for each layer (which there is only on in DVB) if (get_bits(gb, 3)) { // numLayer av_log_missing_feature(latmctx->aac_ctx.avctx, - "multiple layers are not supported\n", 1); + "multiple layers", 1); return AVERROR_PATCHWELCOME; } |