virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-04 22:03:09 +02:00
Code Issues Releases Activity

avcodec/mpegvideo: Move SLICE_* defs to h263dec.h, h261dec.c

Browse Source 
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@outlook.com>
This commit is contained in:
Andreas Rheinhardt
2025-06-20 12:46:43 +02:00
parent 2089d39735
commit 502a6ea123
3 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h261dec.c
View File

@ -37,6 +37,10 @@
#include "mpegvideodec.h" #include "mpegvideodec.h"
#include "h261.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_MBA_VLC_BITS 8
#define H261_MTYPE_VLC_BITS 6 #define H261_MTYPE_VLC_BITS 6
#define H261_MV_VLC_BITS 7 #define H261_MV_VLC_BITS 7

4
libavcodec/h263dec.h
View File

@ -73,6 +73,10 @@ typedef struct H263DecContext {
int rv10_first_dc_coded[3]; int rv10_first_dc_coded[3];
int (*decode_mb)(struct H263DecContext *h); 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 GetBitContext last_resync_gb; ///< used to search for the next resync marker

5
libavcodec/mpegvideo.h
View File

@ -285,11 +285,6 @@ typedef struct MpegEncContext {
int interlaced_dct; int interlaced_dct;
int first_field; ///< is 1 for the first field of a field picture 0 otherwise 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) void (*dct_unquantize_intra)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both)
int16_t *block/*align 16*/, int n, int qscale); int16_t *block/*align 16*/, int n, int qscale);
void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both) void (*dct_unquantize_inter)(struct MpegEncContext *s, // unquantizer to use (MPEG-4 can use both)