mirror of https://git.ffmpeg.org/ffmpeg.git
Merge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'
* commit '187105ff8a02bafc9c58d9d8363bb3f55a415635': Fix references to deleted avcodec_encode_video() function Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
ff4548f223
|
@ -4400,7 +4400,7 @@ enabled xmm_clobber_test &&
|
||||||
-Wl,--wrap,avcodec_decode_video2 \
|
-Wl,--wrap,avcodec_decode_video2 \
|
||||||
-Wl,--wrap,avcodec_decode_subtitle2 \
|
-Wl,--wrap,avcodec_decode_subtitle2 \
|
||||||
-Wl,--wrap,avcodec_encode_audio2 \
|
-Wl,--wrap,avcodec_encode_audio2 \
|
||||||
-Wl,--wrap,avcodec_encode_video \
|
-Wl,--wrap,avcodec_encode_video2 \
|
||||||
-Wl,--wrap,avcodec_encode_subtitle \
|
-Wl,--wrap,avcodec_encode_subtitle \
|
||||||
-Wl,--wrap,sws_scale ||
|
-Wl,--wrap,sws_scale ||
|
||||||
disable xmm_clobber_test
|
disable xmm_clobber_test
|
||||||
|
|
|
@ -304,7 +304,7 @@ typedef struct MpegEncContext {
|
||||||
/* WARNING: changes above this line require updates to hardcoded
|
/* WARNING: changes above this line require updates to hardcoded
|
||||||
* offsets used in asm. */
|
* offsets used in asm. */
|
||||||
|
|
||||||
int64_t user_specified_pts;///< last non zero pts from AVFrame which was passed into avcodec_encode_video()
|
int64_t user_specified_pts; ///< last non-zero pts from AVFrame which was passed into avcodec_encode_video2()
|
||||||
/**
|
/**
|
||||||
* pts difference between the first and second input frame, used for
|
* pts difference between the first and second input frame, used for
|
||||||
* calculating dts of the first frame when there's a delay */
|
* calculating dts of the first frame when there's a delay */
|
||||||
|
|
Loading…
Reference in New Issue