[FFmpeg-cvslog] avcodec/diracdec: Don't use EDGE_WIDTH from mpegpicture.h

Andreas Rheinhardt git at videolan.org
Tue May 7 14:31:40 EEST 2024


ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinhardt at outlook.com> | Mon May  6 23:42:24 2024 +0200| [39ce8a96958fdc80ebc549ab7525b06dadf8bbbd] | committer: Andreas Rheinhardt

avcodec/diracdec: Don't use EDGE_WIDTH from mpegpicture.h

There is nothing that forces us to use the same value
as mpegvideo_enc.c, so define our own constant.

Reviewed-by: Lynne <dev at lynne.ee>
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt at outlook.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=39ce8a96958fdc80ebc549ab7525b06dadf8bbbd
---

 libavcodec/diracdec.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/diracdec.c b/libavcodec/diracdec.c
index f1fde0b339..3a36479c59 100644
--- a/libavcodec/diracdec.c
+++ b/libavcodec/diracdec.c
@@ -37,7 +37,6 @@
 #include "golomb.h"
 #include "dirac_arith.h"
 #include "dirac_vlc.h"
-#include "mpegpicture.h"
 #include "mpegvideoencdsp.h"
 #include "dirac_dwt.h"
 #include "dirac.h"
@@ -45,6 +44,8 @@
 #include "diracdsp.h"
 #include "videodsp.h"
 
+#define EDGE_WIDTH 16
+
 /**
  * The spec limits this to 3 for frame coding, but in practice can be as high as 6
  */



More information about the ffmpeg-cvslog mailing list