Commit 4841624e authored by Jan Gerber's avatar Jan Gerber
Browse files

- make get_ffmpeg_cvs.sh a bit better

- also call ogg_stream_flush on audio stream

parent 71750e96
......@@ -3,6 +3,13 @@
#optional, if you have the libs installed:
#extra="--enable-faad --enable-dts --enable-libgsm --enable-amr_nb --enable-amr_nb-fixed --enable-amr_wb --enable-amr_if2"
common="--enable-libogg --enable-theora --enable-a52 --enable-gpl --disable-encoders"
#linux
options="$common --enable-pthreads $extra"
#mingw32
uname | grep MINGW && options="$common --enable-memalign-hack --enable-mingw32 --extra-cflags=-I/usr/local/include --extra-ldflags=-L/usr/local/lib $extra"
cvs -z3 -d:pserver:anonymous@cvs.mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
cd ffmpeg && ./configure --enable-libogg --enable-theora --enable-a52 --enable-pthreads --enable-gpl --disable-encoders --disable-muxers $extra && make
make
cd ffmpeg && ./configure $options && make
......@@ -327,7 +327,16 @@ void oggmux_flush (oggmux_info *info, int e_o_s)
}
}
if(!info->video_only && !info->audiopage_valid) {
if(ogg_stream_pageout(&info->vo, &og) > 0) {
// this way seeking is much better,
// not sure if 23 packets is a good value. it works though
int a_next=0;
if(info->a_pkg>22 && ogg_stream_flush(&info->vo, &og) > 0) {
a_next=1;
}
else if(ogg_stream_pageout(&info->vo, &og) > 0) {
a_next=1;
}
if(a_next) {
len = og.header_len + og.body_len;
if(info->audiopage_buffer_length < len) {
info->audiopage = realloc(info->audiopage, len);
......
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