[FFmpeg-trac] #9495(undetermined:new): Does commit 4a71da0f3a need to be reapplied?
FFmpeg
trac at avcodec.org
Thu Nov 4 16:15:09 EET 2021
#9495: Does commit 4a71da0f3a need to be reapplied?
-------------------------------------+-------------------------------------
Reporter: msbit | Type:
| enhancement
Status: new | Priority: normal
Component: | Version: git-
undetermined | master
Keywords: | Blocked By:
Blocking: | Reproduced by developer: 0
Analyzed by developer: 0 |
-------------------------------------+-------------------------------------
I was looking over the repository as part of answering:
https://stackoverflow.com/questions/69839445/seemingly-missing-
changes-in-a-git-commit/69840265#69840265
and it does appear that part of the contents of:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/4a71da0f3a
were not applied, namely the following diff:
{{{
diff --git a/libavcodec/ac3enc_combined.c b/libavcodec/ac3enc_combined.c
index a3f1d27bc5..db832f1f03 100644
--- a/libavcodec/ac3enc_combined.c
+++ b/libavcodec/ac3enc_combined.c
@@ -19,24 +19,6 @@ typedef struct CombineContext{
#define AC3ENC_TYPE_EAC3 2
#define AC3ENC_TYPE 12354
-
-/* common option values */
-#define AC3ENC_OPT_NONE -1
-#define AC3ENC_OPT_AUTO -1
-#define AC3ENC_OPT_OFF 0
-#define AC3ENC_OPT_ON 1
-#define AC3ENC_OPT_NOT_INDICATED 0
-#define AC3ENC_OPT_MODE_ON 1
-#define AC3ENC_OPT_MODE_OFF 2
-
-/* specific option values */
-#define AC3ENC_OPT_LARGE_ROOM 1
-#define AC3ENC_OPT_SMALL_ROOM 2
-#define AC3ENC_OPT_DOWNMIX_LTRT 1
-#define AC3ENC_OPT_DOWNMIX_LORO 2
-#define AC3ENC_OPT_ADCONV_STANDARD 0
-#define AC3ENC_OPT_ADCONV_HDCD 1
-
#include "ac3enc_opts_template.c"
static AVClass ac3enc_class = { "AC-3 Encoder", av_default_item_name,
diff --git a/libavcodec/cavsdec.c b/libavcodec/cavsdec.c
index fedee8bf72..1b8fedf2b1 100644
--- a/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@ -133,12 +133,14 @@ static int decode_residual_block(AVSContext *h,
GetBitContext *gb,
r++;
mask = -(level_code & 1);
level = (level^mask) - mask;
- } else {
+ } else if (level_code >= 0) {
level = r->rltab[level_code][0];
if(!level) //end of block signal
break;
run = r->rltab[level_code][1];
r += r->rltab[level_code][2];
+ } else {
+ break;
}
level_buf[i] = level;
run_buf[i] = run;
}}}
prepared by running:
{{{
git checkout d912e449b6^1
git merge --no-edit --no-ff d912e449b6^2
git diff d912e449b6 HEAD > 4a71da0f3a.patch
}}}
This doesn't apply cleaning onto `master`, due to
`libavcodec/ac3enc_combined.c` being removed as part of:
https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/9f4d37f450
but the `#define`s are present in `libavcodec/ac3enc.h`.
--
Ticket URL: <https://trac.ffmpeg.org/ticket/9495>
FFmpeg <https://ffmpeg.org>
FFmpeg issue tracker
More information about the FFmpeg-trac
mailing list