RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Make libx264 take the pict_type input parameter into account, 

thus making forced key frames work.

Patch by Nicolas George, nicolas d george a normalesup d org

Originally committed as revision 25567 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Nicolas George 2010-10-25 14:40:00 +00:00 committed by Carl Eugen Hoyos
parent 276df9d821
commit 3ab354d777
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/libx264.c
View File

@ -100,7 +100,11 @@ static int X264_frame(AVCodecContext *ctx, uint8_t *buf,
}
x4->pic.i_pts = frame->pts;
x4->pic.i_type = X264_TYPE_AUTO;
x4->pic.i_type =
frame->pict_type == FF_I_TYPE ? X264_TYPE_KEYFRAME :
frame->pict_type == FF_P_TYPE ? X264_TYPE_P :
frame->pict_type == FF_B_TYPE ? X264_TYPE_B :
X264_TYPE_AUTO;
}
do {