Re: [FFmpeg-devel] [PATCH]Fix dnxhd pix_fmt change

[Carl Eugen Hoyos]

Michael Niedermayer  gmx.at> writes:

> >  dnxhddec.c |9 +
> >  1 file changed, 5 insertions(+), 4 deletions(-)
> > faf7809dc5b971e27c493e25e8f56a41e7743bd7  patchdnxhd.diff
> > diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
> 
> LGTM

The change was merged.

Thank you, Carl Eugen

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH]Fix dnxhd pix_fmt change

[Michael Niedermayer]

On Sat, Mar 28, 2015 at 09:38:12AM +0100, Carl Eugen Hoyos wrote:
> Hi!
> 
> Attached patch fixes ticket #4400 for me, please comment.
> 
> Carl Eugen

>  dnxhddec.c |9 +
>  1 file changed, 5 insertions(+), 4 deletions(-)
> faf7809dc5b971e27c493e25e8f56a41e7743bd7  patchdnxhd.diff
> diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c

LGTM

[...]

-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Old school: Use the lowest level language in which you can solve the problem
conveniently.
New school: Use the highest level language in which the latest supercomputer
can solve the problem without the user falling asleep waiting.


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH]Fix dnxhd pix_fmt change

[Carl Eugen Hoyos]

Hi!

Attached patch fixes ticket #4400 for me, please comment.

Carl Eugen
diff --git a/libavcodec/dnxhddec.c b/libavcodec/dnxhddec.c
index cc011c4..053bf1c 100644
--- a/libavcodec/dnxhddec.c
+++ b/libavcodec/dnxhddec.c
@@ -119,6 +119,7 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame 
*frame,
 static const uint8_t header_prefix[]= { 0x00, 0x00, 0x02, 0x80, 0x01 };
 static const uint8_t header_prefix444[] = { 0x00, 0x00, 0x02, 0x80, 0x02 };
 int i, cid, ret;
+int old_bit_depth = ctx->bit_depth;
 
 if (buf_size < 0x280) {
 av_log(ctx->avctx, AV_LOG_ERROR, "buffer too small (%d < 640).\n",
@@ -145,10 +146,6 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame 
*frame,
 
 av_dlog(ctx->avctx, "width %d, height %d\n", ctx->width, ctx->height);
 
-if (!ctx->bit_depth) {
-ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
-ff_idctdsp_init(&ctx->idsp, ctx->avctx);
-}
 if (buf[0x21] == 0x58) { /* 10 bit */
 ctx->bit_depth = ctx->avctx->bits_per_raw_sample = 10;
 
@@ -172,6 +169,10 @@ static int dnxhd_decode_header(DNXHDContext *ctx, AVFrame 
*frame,
buf[0x21]);
 return AVERROR_INVALIDDATA;
 }
+if (ctx->bit_depth != old_bit_depth) {
+ff_blockdsp_init(&ctx->bdsp, ctx->avctx);
+ff_idctdsp_init(&ctx->idsp, ctx->avctx);
+}
 
 cid = AV_RB32(buf + 0x28);
 av_dlog(ctx->avctx, "compression id %d\n", cid);
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel