[FFmpeg-devel,1/2] lavc/libdavs2: remove incorrect frame settings

Submitted by hwren on Oct. 30, 2018, 2:01 p.m.

Details

Message ID 1540908074-4260-1-git-send-email-hwrenx@126.com
State New
Headers show

Commit Message

hwren Oct. 30, 2018, 2:01 p.m.
Signed-off-by: hwren <hwrenx@126.com>
---
 libavcodec/libdavs2.c | 7 -------
 1 file changed, 7 deletions(-)

Comments

Mark Thompson Oct. 31, 2018, 12:02 a.m.
On 30/10/18 14:01, hwren wrote:
> Signed-off-by: hwren <hwrenx@126.com>
> ---
>  libavcodec/libdavs2.c | 7 -------
>  1 file changed, 7 deletions(-)
> 
> diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
> index cadf995..581d568 100644
> --- a/libavcodec/libdavs2.c
> +++ b/libavcodec/libdavs2.c
> @@ -96,13 +96,6 @@ static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic,
>                     pic->widths[plane] * bytes_per_sample);
>      }
>  
> -    frame->width     = cad->headerset.width;
> -    frame->height    = cad->headerset.height;
> -    frame->pts       = cad->out_frame.pts;
> -    frame->pict_type = pic->type;
> -    frame->format    = avctx->pix_fmt;
> -
> -    cad->decoded_frames++;
>      return 1;
>  }
>  
> 

This seems like it loses track of the timestamps?  Output pts is always AV_NOPTS_VALUE after this change.

(Patch 3/3 should also be squashed into this one, since this is removing the last use of the decoded_frames counter.)

Thanks,

- Mark

Patch hide | download patch | download mbox

diff --git a/libavcodec/libdavs2.c b/libavcodec/libdavs2.c
index cadf995..581d568 100644
--- a/libavcodec/libdavs2.c
+++ b/libavcodec/libdavs2.c
@@ -96,13 +96,6 @@  static int davs2_dump_frames(AVCodecContext *avctx, davs2_picture_t *pic,
                    pic->widths[plane] * bytes_per_sample);
     }
 
-    frame->width     = cad->headerset.width;
-    frame->height    = cad->headerset.height;
-    frame->pts       = cad->out_frame.pts;
-    frame->pict_type = pic->type;
-    frame->format    = avctx->pix_fmt;
-
-    cad->decoded_frames++;
     return 1;
 }