On 21/11/14 13:57, Vittorio Giovara wrote:
> Bug-Id: CID 1238993
> ---
> libavformat/sol.c | 19 ++++++++-----------
> 1 file changed, 8 insertions(+), 11 deletions(-)
>
> diff --git a/libavformat/sol.c b/libavformat/sol.c
> index 92599b1..30f0547 100644
> --- a/libavformat/sol.c
> +++ b/libavformat/sol.c
> @@ -50,18 +50,15 @@ static int sol_probe(AVProbeData *p)
>
> static enum AVCodecID sol_codec_id(int magic, int type)
> {
> - if (magic == 0x0B8D)
> - {
> - if (type & SOL_DPCM) return AV_CODEC_ID_SOL_DPCM;
> - else return AV_CODEC_ID_PCM_U8;
> - }
> if (type & SOL_DPCM)
> - {
> - if (type & SOL_16BIT) return AV_CODEC_ID_SOL_DPCM;
> - else if (magic == 0x0C8D) return AV_CODEC_ID_SOL_DPCM;
> - else return AV_CODEC_ID_SOL_DPCM;
> - }
> - if (type & SOL_16BIT) return AV_CODEC_ID_PCM_S16LE;
> + return AV_CODEC_ID_SOL_DPCM;
> +
> + if (magic == 0x0B8D)
> + return AV_CODEC_ID_PCM_U8;
> +
> + if (type & SOL_16BIT)
> + return AV_CODEC_ID_PCM_S16LE;
> +
> return AV_CODEC_ID_PCM_U8;
> }
>
>
Probably ok.
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
