diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-15 02:15:25 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-15 02:15:25 +0200 |
| commit | c137fdd778e1bb82c2f0d7fa4a88adc97058d6d4 (patch) | |
| tree | 6ba8284ec414ae9cc98d70a80fcb81a719d66272 /libavcodec/ac3enc.h | |
| parent | 9e2f448d68d9df7ad79d968db315c6b0cc79c4df (diff) | |
| parent | 4e0583020567dd2062a908fe59aacba484e68049 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
swscale: remove misplaced comment.
ffmpeg: fix streaming to ffserver.
swscale: split out RGB48 output functions from yuv2packed[12X]_c().
build: move vpath directives to main Makefile
swscale: fix JPEG-range YUV scaling artifacts.
build: move ALLFFLIBS to a more logical place
ARM: factor some repetitive code into macros
Fix SVQ3 after adding 4:4:4 H.264 support
H.264: fix CODEC_FLAG_GRAY
4:4:4 H.264 decoding support
ac3enc: fix allocation of floating point samples.
Conflicts:
ffmpeg.c
libavcodec/dsputil_template.c
libavcodec/h264.c
libavcodec/mpegvideo.c
libavcodec/snow.c
libswscale/swscale.c
libswscale/swscale_internal.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/ac3enc.h')
| -rw-r--r-- | libavcodec/ac3enc.h | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/libavcodec/ac3enc.h b/libavcodec/ac3enc.h index d5f662b4aa..563dcd532e 100644 --- a/libavcodec/ac3enc.h +++ b/libavcodec/ac3enc.h @@ -135,6 +135,7 @@ typedef struct AC3Block { typedef struct AC3EncodeContext { AVClass *av_class; ///< AVClass used for AVOption AC3EncOptions options; ///< encoding options + AVCodecContext *avctx; ///< parent AVCodecContext PutBitContext pb; ///< bitstream writer context DSPContext dsp; AC3DSPContext ac3dsp; ///< AC-3 optimized functions @@ -230,6 +231,7 @@ typedef struct AC3EncodeContext { void (*scale_coefficients)(struct AC3EncodeContext *s); /* fixed vs. float templated function pointers */ + int (*allocate_sample_buffers)(struct AC3EncodeContext *s); void (*deinterleave_input_samples)(struct AC3EncodeContext *s, const SampleType *samples); void (*apply_mdct)(struct AC3EncodeContext *s); @@ -276,6 +278,9 @@ void ff_ac3_float_scale_coefficients(AC3EncodeContext *s); /* prototypes for functions in ac3enc_template.c */ +int ff_ac3_fixed_allocate_sample_buffers(AC3EncodeContext *s); +int ff_ac3_float_allocate_sample_buffers(AC3EncodeContext *s); + void ff_ac3_fixed_deinterleave_input_samples(AC3EncodeContext *s, const SampleType *samples); void ff_ac3_float_deinterleave_input_samples(AC3EncodeContext *s, |