summaryrefslogtreecommitdiff
path: root/libavcodec/flacenc.c
diff options
context:
space:
mode:
authorJustin Ruggles <justin.ruggles@gmail.com>2009-03-21 01:20:28 +0000
committerJustin Ruggles <justin.ruggles@gmail.com>2009-03-21 01:20:28 +0000
commitf121622114f15c243a6daed3f89a9a0a7e5b7087 (patch)
tree86427f744a003e7c9b51fe16b69018cc9eb0d011 /libavcodec/flacenc.c
parentd4df4e508854803ce3bc393c4f718096ad7cbf41 (diff)
revert accidental unrelated change in last commit
Originally committed as revision 18090 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flacenc.c')
-rw-r--r--libavcodec/flacenc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/flacenc.c b/libavcodec/flacenc.c
index 679ad57b97..f51a4ee58b 100644
--- a/libavcodec/flacenc.c
+++ b/libavcodec/flacenc.c
@@ -80,10 +80,12 @@ typedef struct FlacFrame {
} FlacFrame;
typedef struct FlacEncodeContext {
- FLACSTREAMINFO
PutBitContext pb;
+ int channels;
+ int samplerate;
int sr_code[2];
int min_framesize;
+ int max_framesize;
int max_encoded_framesize;
uint32_t frame_count;
uint64_t sample_count;