[FFmpeg-devel] [PATCH 3/3] avutil/camellia: use EINVAL instead of -1 for the return code of av_camellia_init()

[Ganesh Ajjanagadde]

On Sun, Oct 18, 2015 at 2:21 PM, Michael Niedermayer
<michael at niedermayer.cc> wrote:
> On Sun, Oct 18, 2015 at 11:58:55AM -0400, Ganesh Ajjanagadde wrote:
>> On Sat, Oct 17, 2015 at 8:07 PM, Ganesh Ajjanagadde
>> <gajjanagadde at gmail.com> wrote:
>> > Signed-off-by: Ganesh Ajjanagadde <gajjanagadde at gmail.com>
>> > ---
>> >  libavutil/camellia.c | 2 +-
>> >  1 file changed, 1 insertion(+), 1 deletion(-)
>> >
>> > diff --git a/libavutil/camellia.c b/libavutil/camellia.c
>> > index 483eed2..f21ca12 100644
>> > --- a/libavutil/camellia.c
>> > +++ b/libavutil/camellia.c
>> > @@ -354,7 +354,7 @@ av_cold int av_camellia_init(AVCAMELLIA *cs, const uint8_t *key, int key_bits)
>> >      uint64_t Kl[2], Kr[2], Ka[2], Kb[2];
>> >      uint64_t D1, D2;
>> >      if (key_bits != 128 && key_bits != 192 && key_bits != 256)
>> > -        return -1;
>> > +        return AVERROR(EINVAL);
>> >      memset(Kb, 0, sizeof(Kb));
>> >      memset(Kr, 0, sizeof(Kr));
>> >      cs->key_bits = key_bits;
>> > --
>> > 2.6.1
>> >
>>
>> ping, are these 3 fine as well? I will then squash the avutil crypto
>> return code changes and push.
>
> i think they are fine

thanks, pushed
>
> [...]
> --
> Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB
>
> While the State exists there can be no freedom; when there is freedom there
> will be no State. -- Vladimir Lenin
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>