ffmpeg | branch: master | Andreas Rheinhardt <andreas.rheinha...@outlook.com> | Fri Jun 20 12:46:43 2025 +0200| [502a6ea123cf159194d3ba6e46c98382b72b37b1] | committer: Andreas Rheinhardt
avcodec/mpegvideo: Move SLICE_* defs to h263dec.h, h261dec.c Signed-off-by: Andreas Rheinhardt <andreas.rheinha...@outlook.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=502a6ea123cf159194d3ba6e46c98382b72b37b1 --- libavcodec/h261dec.c | 4 ++++ libavcodec/h263dec.h | 4 ++++ libavcodec/mpegvideo.h | 5 ----- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/libavcodec/h261dec.c b/libavcodec/h261dec.c index e47bc00a71..32d41903e7 100644 --- a/libavcodec/h261dec.c +++ b/libavcodec/h261dec.c @@ -37,6 +37,10 @@ #include "mpegvideodec.h" #include "h261.h" +#define SLICE_OK 0 +#define SLICE_ERROR -1 +#define SLICE_END -2 ///<end marker found + #define H261_MBA_VLC_BITS 8 #define H261_MTYPE_VLC_BITS 6 #define H261_MV_VLC_BITS 7 diff --git a/libavcodec/h263dec.h b/libavcodec/h263dec.h index 90340a59bd..0c6228f9d9 100644 --- a/libavcodec/h263dec.h +++ b/libavcodec/h263dec.h @@ -73,6 +73,10 @@ typedef struct H263DecContext { int rv10_first_dc_coded[3]; int (*decode_mb)(struct H263DecContext *h); +#define SLICE_OK 0 +#define SLICE_ERROR -1 +#define SLICE_END -2 ///<end marker found +#define SLICE_NOEND -3 ///<no end marker or error found but mb count exceeded GetBitContext last_resync_gb; ///< used to search for the next resync marker diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 4c5f034690..9318801019 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -285,11 +285,6 @@ typedef struct MpegEncContext { int interlaced_dct; int first_field; ///< is 1 for the first field of a field picture 0 otherwise -#define SLICE_OK 0 -#define SLICE_ERROR -1 -#define SLICE_END -2 ///<end marker found -#define SLICE_NOEND -3 ///<no end marker or error found but mb count exceeded - void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both) int16_t *block/*align 16*/, int n, int qscale); void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
