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

libvo-aacenc,libvo-amrwbenc}: fix api usage 

Use the correct error codes and format identifier.
This commit is contained in:
Luca Barbato 2011-04-18 22:12:50 +02:00
parent 139f3ac42d
commit facc48f157
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/libvo-aacenc.c
View File

@ -59,7 +59,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
if (s->codec_api.SetParam(s->handle, VO_PID_AAC_ENCPARAM, &params) if (s->codec_api.SetParam(s->handle, VO_PID_AAC_ENCPARAM, &params)
!= VO_ERR_NONE) { != VO_ERR_NONE) {
av_log(avctx, AV_LOG_ERROR, "Unable to set encoding parameters\n"); av_log(avctx, AV_LOG_ERROR, "Unable to set encoding parameters\n");
return AVERROR_UNKNOWN; return AVERROR(EINVAL);
} }
for (index = 0; index < 16; index++) for (index = 0; index < 16; index++)
@ -68,7 +68,7 @@ static av_cold int aac_encode_init(AVCodecContext *avctx)
if (index == 16) { if (index == 16) {
av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate %d\n", av_log(avctx, AV_LOG_ERROR, "Unsupported sample rate %d\n",
avctx->sample_rate); avctx->sample_rate);
return AVERROR_NOTSUPP; return AVERROR(ENOSYS);
} }
if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) { if (avctx->flags & CODEC_FLAG_GLOBAL_HEADER) {
avctx->extradata_size = 2; avctx->extradata_size = 2;
@ -110,14 +110,14 @@ static int aac_encode_frame(AVCodecContext *avctx,
if (s->codec_api.GetOutputData(s->handle, &output, &output_info) if (s->codec_api.GetOutputData(s->handle, &output, &output_info)
!= VO_ERR_NONE) { != VO_ERR_NONE) {
av_log(avctx, AV_LOG_ERROR, "Unable to encode frame\n"); av_log(avctx, AV_LOG_ERROR, "Unable to encode frame\n");
return AVERROR_UNKNOWN; return AVERROR(EINVAL);
} }
return output.Length; return output.Length;
} }
AVCodec ff_libvo_aacenc_encoder = { AVCodec ff_libvo_aacenc_encoder = {
"libvo_aacenc", "libvo_aacenc",
CODEC_TYPE_AUDIO, AVMEDIA_TYPE_AUDIO,
CODEC_ID_AAC, CODEC_ID_AAC,
sizeof(AACContext), sizeof(AACContext),
aac_encode_init, aac_encode_init,

2
libavcodec/libvo-amrwbenc.c
View File

@ -119,7 +119,7 @@ static int amr_wb_encode_frame(AVCodecContext *avctx,
AVCodec ff_libvo_amrwbenc_encoder = { AVCodec ff_libvo_amrwbenc_encoder = {
"libvo_amrwbenc", "libvo_amrwbenc",
CODEC_TYPE_AUDIO, AVMEDIA_TYPE_AUDIO,
CODEC_ID_AMR_WB, CODEC_ID_AMR_WB,
sizeof(AMRWBContext), sizeof(AMRWBContext),
amr_wb_encode_init, amr_wb_encode_init,