summaryrefslogtreecommitdiff
authorVittorio Giovara <vittorio.giovara@gmail.com>2013-09-10 10:31:46 (GMT)
committer Diego Biurrun <diego@biurrun.de>2013-09-16 11:59:19 (GMT)
commit187105ff8a02bafc9c58d9d8363bb3f55a415635 (patch)
tree250f66678212e99dbaa7528c31ad7abcf2f7a270
parent85e8192b8593816c0445411a5bef5fc5363a9b6d (diff)
downloadffmpeg-187105ff8a02bafc9c58d9d8363bb3f55a415635.zip
ffmpeg-187105ff8a02bafc9c58d9d8363bb3f55a415635.tar.gz
ffmpeg-187105ff8a02bafc9c58d9d8363bb3f55a415635.tar.bz2
Fix references to deleted avcodec_encode_video() function
Diffstat
-rwxr-xr-xconfigure2
-rw-r--r--libavcodec/mpegvideo.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/configure b/configure
index e6f8b52..b95e4ac 100755
--- a/configure
+++ b/configure
@@ -3893,7 +3893,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 307ed5f..81e3d2b 100644
--- a/libavcodec/mpegvideo.h
+++ b/libavcodec/mpegvideo.h
@@ -295,7 +295,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 */