diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:42:05 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-14 15:42:05 +0100 |
| commit | a24aef5dfa5117008c74ee2149346eebe325349d (patch) | |
| tree | bd25d7a116836aed6fc274ba61415e199cb40e1e /libavcodec/twinvq.h | |
| parent | 2cfdc2879a6cc2f956a8a1878a4a6490c58ad5c7 (diff) | |
| parent | 1afa8a7568ba57ad0cd2923f6e641e10d32cded4 (diff) | |
| download | ffmpeg-a24aef5dfa5117008c74ee2149346eebe325349d.tar.gz | |
Merge commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4'
* commit '1afa8a7568ba57ad0cd2923f6e641e10d32cded4':
twinvq: support multiple frames per packet
Conflicts:
libavcodec/twinvq.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/twinvq.h')
| -rw-r--r-- | libavcodec/twinvq.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/twinvq.h b/libavcodec/twinvq.h index 44215db59b..9ff355470e 100644 --- a/libavcodec/twinvq.h +++ b/libavcodec/twinvq.h @@ -58,6 +58,8 @@ enum TwinVQFrameType { #define TWINVQ_SUBBLOCKS_MAX 16 #define TWINVQ_BARK_N_COEF_MAX 4 +#define TWINVQ_MAX_FRAMES_PER_PACKET 2 + /** * Parameters and tables that are different for each frame type */ @@ -162,7 +164,8 @@ typedef struct TwinVQContext { // scratch buffers float *tmp_buf; - TwinVQFrameData bits; + int frame_size, frames_per_packet, cur_frame; + TwinVQFrameData bits[TWINVQ_MAX_FRAMES_PER_PACKET]; enum TwinVQCodec codec; |