On 2013-01-08 15:37:27 +0100, Anton Khirnov wrote:
> ---
> libavcodec/tscc2.c | 17 +++++++----------
> 1 file changed, 7 insertions(+), 10 deletions(-)
>
> diff --git a/libavcodec/tscc2.c b/libavcodec/tscc2.c
> index b7f1b88..439de91 100644
> --- a/libavcodec/tscc2.c
> +++ b/libavcodec/tscc2.c
> @@ -28,6 +28,7 @@
> #include "avcodec.h"
> #include "get_bits.h"
> #include "bytestream.h"
> +#include "internal.h"
> #include "tscc2data.h"
>
> typedef struct TSCC2Context {
> @@ -229,17 +230,15 @@ static int tscc2_decode_frame(AVCodecContext *avctx,
> void *data,
> return AVERROR_INVALIDDATA;
> }
>
> - c->pic.reference = 3;
> - c->pic.buffer_hints = FF_BUFFER_HINTS_VALID | FF_BUFFER_HINTS_PRESERVE |
> - FF_BUFFER_HINTS_REUSABLE;
> - if ((ret = avctx->reget_buffer(avctx, &c->pic)) < 0) {
> + if ((ret = ff_reget_buffer(avctx, &c->pic)) < 0) {
> av_log(avctx, AV_LOG_ERROR, "reget_buffer() failed\n");
> return ret;
> }
>
> if (frame_type == 0) {
> *got_frame = 1;
> - *(AVFrame*)data = c->pic;
> + if ((ret = av_frame_ref(data, &c->pic)) < 0)
> + return ret;
>
> return buf_size;
> }
> @@ -323,7 +322,8 @@ static int tscc2_decode_frame(AVCodecContext *avctx, void
> *data,
> }
>
> *got_frame = 1;
> - *(AVFrame*)data = c->pic;
> + if ((ret = av_frame_ref(data, &c->pic)) < 0)
> + return ret;
>
> /* always report that the buffer was completely consumed */
> return buf_size;
> @@ -352,8 +352,6 @@ static av_cold int tscc2_decode_init(AVCodecContext
> *avctx)
> return AVERROR(ENOMEM);
> }
>
> - avctx->coded_frame = &c->pic;
> -
> return 0;
> }
>
> @@ -361,8 +359,7 @@ static av_cold int tscc2_decode_end(AVCodecContext *avctx)
> {
> TSCC2Context * const c = avctx->priv_data;
>
> - if (c->pic.data[0])
> - avctx->release_buffer(avctx, &c->pic);
> + av_frame_unref(&c->pic);
> av_freep(&c->slice_quants);
> free_vlcs(c);
ok
Janne
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
