mirror of
https://github.com/mpv-player/mpv
synced 2024-12-26 09:02:38 +00:00
sync to x264-r1296
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29787 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
b2e3df350a
commit
e155d3d9f9
2
configure
vendored
2
configure
vendored
@ -7221,7 +7221,7 @@ if test "$_x264" = auto ; then
|
||||
cat > $TMPC << EOF
|
||||
#include <inttypes.h>
|
||||
#include <x264.h>
|
||||
#if X264_BUILD < 76
|
||||
#if X264_BUILD < 78
|
||||
#error We do not support old versions of x264. Get the latest from git.
|
||||
#endif
|
||||
int main(void) { x264_encoder_open((void*)0); return 0; }
|
||||
|
@ -185,7 +185,7 @@ static int config(struct vf_instance_s* vf, int width, int height, int d_width,
|
||||
mod->mux->bih->biSize= sizeof(BITMAPINFOHEADER) + extradata_size;
|
||||
}
|
||||
|
||||
if (param.i_bframe > 1 && param.b_bframe_pyramid)
|
||||
if (param.i_bframe > 1 && param.i_bframe_pyramid)
|
||||
mod->mux->decoder_delay = 2;
|
||||
else
|
||||
mod->mux->decoder_delay = param.i_bframe ? 1 : 0;
|
||||
|
Loading…
Reference in New Issue
Block a user