avcodec/utvideoenc: Don't use bitcounts when byte-aligned

[ffmpeg] / libavcodec / ac3enc.h

diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h
index ba628913714159c7b05b173f855b6f95029c7cd6..c064ba4d63eccb23397018678393b01cf1eb9768 100644 (file)
--- a/libavcodec/ac3enc.h
+++ b/libavcodec/ac3enc.h
@@ -43,13 +43,6 @@
 #define AC3ENC_FLOAT 0
 #endif
 
-#define OFFSET(param) offsetof(AC3EncodeContext, options.param)
-#define AC3ENC_PARAM (AV_OPT_FLAG_AUDIO_PARAM | AV_OPT_FLAG_ENCODING_PARAM)
-
-#define AC3ENC_TYPE_AC3_FIXED   0
-#define AC3ENC_TYPE_AC3         1
-#define AC3ENC_TYPE_EAC3        2
-
 #if AC3ENC_FLOAT
 #include "libavutil/float_dsp.h"
 #define AC3_NAME(x) ff_ac3_float_ ## x
@@ -273,6 +266,8 @@ typedef struct AC3EncodeContext {
 
 
 extern const uint64_t ff_ac3_channel_layouts[19];
+extern const AVOption ff_ac3_enc_options[];
+extern const AVCodecDefault ff_ac3_enc_defaults[];
 
 int ff_ac3_encode_init(AVCodecContext *avctx);
 int ff_ac3_float_encode_init(AVCodecContext *avctx);