RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

lavc/tta: remove nonsense s->avctx indirection, use avctx directly 

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2013-01-24 10:50:59 +00:00
parent e65046bf83
commit 056664ff25
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libavcodec/tta.c
View File

@ -197,11 +197,11 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
s->format = get_bits(&s->gb, 16); s->format = get_bits(&s->gb, 16);
if (s->format > 2) { if (s->format > 2) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid format\n"); av_log(avctx, AV_LOG_ERROR, "Invalid format\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
if (s->format == FORMAT_ENCRYPTED) { if (s->format == FORMAT_ENCRYPTED) {
av_log_missing_feature(s->avctx, "Encrypted TTA", 0); av_log_missing_feature(avctx, "Encrypted TTA", 0);
return AVERROR_PATCHWELCOME; return AVERROR_PATCHWELCOME;
} }
avctx->channels = s->channels = get_bits(&s->gb, 16); avctx->channels = s->channels = get_bits(&s->gb, 16);
@ -214,10 +214,10 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
skip_bits_long(&s->gb, 32); // CRC32 of header skip_bits_long(&s->gb, 32); // CRC32 of header
if (s->channels == 0) { if (s->channels == 0) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid number of channels\n"); av_log(avctx, AV_LOG_ERROR, "Invalid number of channels\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} else if (avctx->sample_rate == 0) { } else if (avctx->sample_rate == 0) {
av_log(s->avctx, AV_LOG_ERROR, "Invalid samplerate\n"); av_log(avctx, AV_LOG_ERROR, "Invalid samplerate\n");
return AVERROR_INVALIDDATA; return AVERROR_INVALIDDATA;
} }
@ -246,10 +246,10 @@ static av_cold int tta_decode_init(AVCodecContext * avctx)
total_frames = s->data_length / s->frame_length + total_frames = s->data_length / s->frame_length +
(s->last_frame_length ? 1 : 0); (s->last_frame_length ? 1 : 0);
av_log(s->avctx, AV_LOG_DEBUG, "format: %d chans: %d bps: %d rate: %d block: %d\n", av_log(avctx, AV_LOG_DEBUG, "format: %d chans: %d bps: %d rate: %d block: %d\n",
s->format, avctx->channels, avctx->bits_per_coded_sample, avctx->sample_rate, s->format, avctx->channels, avctx->bits_per_coded_sample, avctx->sample_rate,
avctx->block_align); avctx->block_align);
av_log(s->avctx, AV_LOG_DEBUG, "data_length: %d frame_length: %d last: %d total: %d\n", av_log(avctx, AV_LOG_DEBUG, "data_length: %d frame_length: %d last: %d total: %d\n",
s->data_length, s->frame_length, s->last_frame_length, total_frames); s->data_length, s->frame_length, s->last_frame_length, total_frames);
// FIXME: seek table // FIXME: seek table