On 07/07/2012 01:53 AM, Anton Khirnov wrote:
> This way we don't end with an invalid stream if parsing the picture
> fails.
> ---
> libavformat/flacdec.c | 10 ++++++----
> 1 file changed, 6 insertions(+), 4 deletions(-)
>
> diff --git a/libavformat/flacdec.c b/libavformat/flacdec.c
> index f481c10..0be60a4 100644
> --- a/libavformat/flacdec.c
> +++ b/libavformat/flacdec.c
> @@ -38,10 +38,6 @@ static int parse_picture(AVFormatContext *s, uint8_t *buf,
> int buf_size)
> int type, width, height;
> int len, ret = 0;
>
> - st = avformat_new_stream(s, NULL);
> - if (!st)
> - return AVERROR(ENOMEM);
> -
> pb = avio_alloc_context(buf, buf_size, 0, NULL, NULL, NULL, NULL);
> if (!pb)
> return AVERROR(ENOMEM);
> @@ -114,6 +110,12 @@ static int parse_picture(AVFormatContext *s, uint8_t
> *buf, int buf_size)
> goto fail;
> }
>
> + st = avformat_new_stream(s, NULL);
> + if (!st) {
> + ret = AVERROR(ENOMEM);
> + goto fail;
> + }
> +
> av_init_packet(&st->attached_pic);
> st->attached_pic.data = data;
> st->attached_pic.size = len;
LGTM
-Justin
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
