Commit 9e96ab03 authored by Michael Niedermayer's avatar Michael Niedermayer

first rudimentary version of (Justin Ruggles jruggle earthlink net) flac encoder

Originally committed as revision 5514 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 9e0db7d5
......@@ -68,6 +68,9 @@ endif
ifeq ($(CONFIG_FLAC_DECODER),yes)
OBJS+= flac.o
endif
ifeq ($(CONFIG_FLAC_ENCODER),yes)
OBJS+= flacenc.o
endif
ifeq ($(CONFIG_FLIC_DECODER),yes)
OBJS+= flicvideo.o
endif
......
......@@ -72,6 +72,9 @@ void avcodec_register_all(void)
register_avcodec(&faac_encoder);
#endif //CONFIG_FAAC_ENCODER
#endif
#ifdef CONFIG_FLAC_ENCODER
register_avcodec(&flac_encoder);
#endif
#ifdef CONFIG_XVID
#ifdef CONFIG_XVID_ENCODER
register_avcodec(&xvid_encoder);
......
......@@ -2066,6 +2066,7 @@ extern AVCodec mp3lame_encoder;
extern AVCodec oggvorbis_encoder;
extern AVCodec oggtheora_encoder;
extern AVCodec faac_encoder;
extern AVCodec flac_encoder;
extern AVCodec xvid_encoder;
extern AVCodec mpeg1video_encoder;
extern AVCodec mpeg2video_encoder;
......
This diff is collapsed.
......@@ -435,6 +435,10 @@ static inline void set_ur_golomb_jpegls(PutBitContext *pb, int i, int k, int lim
e= (i>>k) + 1;
if(e<limit){
while(e > 31) {
put_bits(pb, 31, 0);
e -= 31;
}
put_bits(pb, e, 1);
if(k)
put_bits(pb, k, i&((1<<k)-1));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment