On Fri, Jun 28, 2013 at 12:24:56PM +0200, Nicolas Bertrand wrote:
> --- a/libavcodec/jpeg2kdec.c
> +++ b/libavcodec/jpeg2kdec.c
> @@ -98,26 +95,22 @@ typedef struct Jpeg2KDecoderContext {
> s->bit_index--;
> - res |= (*s->buf >> s->bit_index) & 1;
> + res |= (bytestream2_peek_byte(&s->g) >> s->bit_index) & 1;
pointless ()
> @@ -1236,19 +1229,18 @@ static int
> jpeg2k_read_bitstream_packets(Jpeg2KDecoderContext *s)
> - while (!found_codestream && search_range) {
> - atom_size = AV_RB32(s->buf);
> - if (AV_RB32(s->buf + 4) == JP2_CODESTREAM) {
> + while(!found_codestream && search_range &&
> bytestream2_get_bytes_left(&s->g) >= 8) {
long line
> @@ -1311,9 +1307,10 @@ static int jpeg2k_decode_frame(AVCodecContext *avctx,
> void *data,
>
> *got_frame = 1;
>
> + return bytestream2_tell(&s->g);
> end:
> jpeg2k_dec_cleanup(s);
> - return ret ? ret : s->buf - s->buf_start;
> + return ret;
> }
Keep the empty line before the goto label.
Diego
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
