Il giorno martedì 3 settembre 2013, Vittorio Giovara ha scritto:
> ---
> libavcodec/eamad.c | 2 +-
> libavcodec/mpeg12dec.c | 9 ++-------
> 2 files changed, 3 insertions(+), 8 deletions(-)
>
> diff --git a/libavcodec/eamad.c b/libavcodec/eamad.c
> index d4c167b..9f5deec 100644
> --- a/libavcodec/eamad.c
> +++ b/libavcodec/eamad.c
> @@ -119,7 +119,7 @@ static inline void decode_block_intra(MadContext *s,
> int16_t * block)
>
> block[0] = (128 + get_sbits(&s->gb, 8)) * quant_matrix[0];
>
> - /* The RL decoder is derived from mpeg1_decode_block_intra;
> + /* The RL decoder is derived from ff_mpeg1_decode_block_intra;
> Escaped level and run values a decoded differently */
> i = 0;
> {
> diff --git a/libavcodec/mpeg12dec.c b/libavcodec/mpeg12dec.c
> index d9b49f3..c76fedc 100644
> --- a/libavcodec/mpeg12dec.c
> +++ b/libavcodec/mpeg12dec.c
> @@ -115,7 +115,7 @@ static int mpeg_decode_motion(MpegEncContext *s, int
> fcode, int pred)
> return sign_extend(val, 5 + shift);
> }
>
> -static inline int mpeg1_decode_block_intra(MpegEncContext *s, int16_t
> *block, int n)
> +int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n)
> {
> int level, dc, diff, i, j, run;
> int component;
> @@ -186,11 +186,6 @@ static inline int
> mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, in
> return 0;
> }
>
> -int ff_mpeg1_decode_block_intra(MpegEncContext *s, int16_t *block, int n)
> -{
> - return mpeg1_decode_block_intra(s, block, n);
> -}
> -
> static inline int mpeg1_decode_block_inter(MpegEncContext *s, int16_t
> *block, int n)
> {
> int level, i, j, run;
> @@ -777,7 +772,7 @@ static int mpeg_decode_mb(MpegEncContext *s, int16_t
> block[12][64])
> }
> } else {
> for (i = 0; i < 6; i++) {
> - if (mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
> + if (ff_mpeg1_decode_block_intra(s, *s->pblocks[i], i) < 0)
> return -1;
> }
> }
> --
> 1.7.9.5
>
>
Ping.
Vittorio
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
