| Message ID | AM7PR03MB6660437D471E49C37E4096B18F5E9@AM7PR03MB6660.eurprd03.prod.outlook.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | [FFmpeg-devel,v2,01/18] avcodec/h264dec: Move find_start_code() to its only user | expand |
| Context | Check | Description |
|---|---|---|
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_aarch64_jetson | success | Make finished |
| andriy/make_fate_aarch64_jetson | success | Make fate finished |
Quoting Andreas Rheinhardt (2022-01-24 21:09:27) > From: Anton Khirnov <anton@khirnov.net> > > The only thing that is actually used directly from there is the > PART_NOT_AVAILABLE constant, which can be trivially copied to svq3 > decoder itself. > > Otherwise it only depends on other indirectly included headers. > --- > libavcodec/svq3.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c > index a3f434ff8d..f06404da9d 100644 > --- a/libavcodec/svq3.c > +++ b/libavcodec/svq3.c > @@ -49,13 +49,16 @@ > #include "internal.h" > #include "avcodec.h" > #include "mpegutils.h" > -#include "h264dec.h" > #include "h264data.h" > +#include "h264dsp.h" > +#include "h264pred.h" > +#include "h264_parse.h" > #include "golomb.h" > #include "hpeldsp.h" > #include "mathops.h" > #include "rectangle.h" > #include "tpeldsp.h" > +#include "videodsp.h" > > #if CONFIG_ZLIB > #include <zlib.h> > @@ -63,6 +66,8 @@ > > #include "svq1.h" > > +#define PART_NOT_AVAILABLE -2 Didn't you want to move it to h264pred? I'm fine with that.
Anton Khirnov: > Quoting Andreas Rheinhardt (2022-01-24 21:09:27) >> From: Anton Khirnov <anton@khirnov.net> >> >> The only thing that is actually used directly from there is the >> PART_NOT_AVAILABLE constant, which can be trivially copied to svq3 >> decoder itself. >> >> Otherwise it only depends on other indirectly included headers. >> --- >> libavcodec/svq3.c | 7 ++++++- >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c >> index a3f434ff8d..f06404da9d 100644 >> --- a/libavcodec/svq3.c >> +++ b/libavcodec/svq3.c >> @@ -49,13 +49,16 @@ >> #include "internal.h" >> #include "avcodec.h" >> #include "mpegutils.h" >> -#include "h264dec.h" >> #include "h264data.h" >> +#include "h264dsp.h" >> +#include "h264pred.h" >> +#include "h264_parse.h" >> #include "golomb.h" >> #include "hpeldsp.h" >> #include "mathops.h" >> #include "rectangle.h" >> #include "tpeldsp.h" >> +#include "videodsp.h" >> >> #if CONFIG_ZLIB >> #include <zlib.h> >> @@ -63,6 +66,8 @@ >> >> #include "svq1.h" >> >> +#define PART_NOT_AVAILABLE -2 > > Didn't you want to move it to h264pred? I'm fine with that. > Yes, I wanted to so, but I didn't want to do it behind your back. Will do now. - Andreas
diff --git a/libavcodec/svq3.c b/libavcodec/svq3.c index a3f434ff8d..f06404da9d 100644 --- a/libavcodec/svq3.c +++ b/libavcodec/svq3.c @@ -49,13 +49,16 @@ #include "internal.h" #include "avcodec.h" #include "mpegutils.h" -#include "h264dec.h" #include "h264data.h" +#include "h264dsp.h" +#include "h264pred.h" +#include "h264_parse.h" #include "golomb.h" #include "hpeldsp.h" #include "mathops.h" #include "rectangle.h" #include "tpeldsp.h" +#include "videodsp.h" #if CONFIG_ZLIB #include <zlib.h> @@ -63,6 +66,8 @@ #include "svq1.h" +#define PART_NOT_AVAILABLE -2 + /** * @file * svq3 decoder.
From: Anton Khirnov <anton@khirnov.net> The only thing that is actually used directly from there is the PART_NOT_AVAILABLE constant, which can be trivially copied to svq3 decoder itself. Otherwise it only depends on other indirectly included headers. --- libavcodec/svq3.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)