| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 08:38:48 (GMT) |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-17 08:53:14 (GMT) |
| commit | ff4548f223fc3021aad5ea5e23c86712e972f48e (patch) | |
| tree | edaad20ad1f6ef3dc57ba622ed47246239e7ebe5 | |
| parent | 7129935ed298cff1f0eef1bad8e938615cabc076 (diff) | |
| parent | 187105ff8a02bafc9c58d9d8363bb3f55a415635 (diff) | |
| download | ffmpeg-ff4548f223fc3021aad5ea5e23c86712e972f48e.zip ffmpeg-ff4548f223fc3021aad5ea5e23c86712e972f48e.tar.gz ffmpeg-ff4548f223fc3021aad5ea5e23c86712e972f48e.tar.bz2 | |
Merge commit '187105ff8a02bafc9c58d9d8363bb3f55a415635'
* commit '187105ff8a02bafc9c58d9d8363bb3f55a415635':
Fix references to deleted avcodec_encode_video() function
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 | ||||
| -rw-r--r-- | libavcodec/mpegvideo.h | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -4400,7 +4400,7 @@ enabled xmm_clobber_test && -Wl,--wrap,avcodec_decode_video2 \ -Wl,--wrap,avcodec_decode_subtitle2 \ -Wl,--wrap,avcodec_encode_audio2 \ - -Wl,--wrap,avcodec_encode_video \ + -Wl,--wrap,avcodec_encode_video2 \ -Wl,--wrap,avcodec_encode_subtitle \ -Wl,--wrap,sws_scale || disable xmm_clobber_test diff --git a/libavcodec/mpegvideo.h b/libavcodec/mpegvideo.h index 23f0164..d17426c 100644 --- a/libavcodec/mpegvideo.h +++ b/libavcodec/mpegvideo.h @@ -304,7 +304,7 @@ typedef struct MpegEncContext { /* WARNING: changes above this line require updates to hardcoded * 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 * calculating dts of the first frame when there's a delay */ |