[FFmpeg-cvslog] lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft

[Anton Khirnov]

ffmpeg | branch: master | Anton Khirnov <anton at khirnov.net> | Sat Feb 23 08:20:12 2013 +0100| [0f24a3ca999a702f83af9307f9f47b6fdeb546a5] | committer: Anton Khirnov

lavc: remove disabled FF_API_OLD_ENCODE_VIDEO cruft

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0f24a3ca999a702f83af9307f9f47b6fdeb546a5
---

 libavcodec/avcodec.h |   20 --------------------
 libavcodec/utils.c   |   36 ------------------------------------
 libavcodec/version.h |    3 ---
 3 files changed, 59 deletions(-)

diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 0d4ac31..c926d5b 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -3726,26 +3726,6 @@ AVCodec *avcodec_find_encoder_by_name(const char *name);
 int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
                           const AVFrame *frame, int *got_packet_ptr);
 
-#if FF_API_OLD_ENCODE_VIDEO
-/**
- * @deprecated use avcodec_encode_video2() instead.
- *
- * Encode a video frame from pict into buf.
- * The input picture should be
- * stored using a specific format, namely avctx.pix_fmt.
- *
- * @param avctx the codec context
- * @param[out] buf the output buffer for the bitstream of encoded frame
- * @param[in] buf_size the size of the output buffer in bytes
- * @param[in] pict the input picture to encode
- * @return On error a negative value is returned, on success zero or the number
- * of bytes used from the output buffer.
- */
-attribute_deprecated
-int avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                         const AVFrame *pict);
-#endif
-
 /**
  * Encode a frame of video.
  *
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index cc7d6d0..13efea4 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1245,42 +1245,6 @@ end:
     return ret;
 }
 
-#if FF_API_OLD_ENCODE_VIDEO
-int attribute_align_arg avcodec_encode_video(AVCodecContext *avctx, uint8_t *buf, int buf_size,
-                                             const AVFrame *pict)
-{
-    AVPacket pkt;
-    int ret, got_packet = 0;
-
-    if (buf_size < FF_MIN_BUFFER_SIZE) {
-        av_log(avctx, AV_LOG_ERROR, "buffer smaller than minimum size\n");
-        return -1;
-    }
-
-    av_init_packet(&pkt);
-    pkt.data = buf;
-    pkt.size = buf_size;
-
-    ret = avcodec_encode_video2(avctx, &pkt, pict, &got_packet);
-    if (!ret && got_packet && avctx->coded_frame) {
-        avctx->coded_frame->pts       = pkt.pts;
-        avctx->coded_frame->key_frame = !!(pkt.flags & AV_PKT_FLAG_KEY);
-    }
-
-    /* free any side data since we cannot return it */
-    if (pkt.side_data_elems > 0) {
-        int i;
-        for (i = 0; i < pkt.side_data_elems; i++)
-            av_free(pkt.side_data[i].data);
-        av_freep(&pkt.side_data);
-        pkt.side_data_elems = 0;
-    }
-
-    return ret ? ret : pkt.size;
-}
-
-#endif
-
 int attribute_align_arg avcodec_encode_video2(AVCodecContext *avctx,
                                               AVPacket *avpkt,
                                               const AVFrame *frame,
diff --git a/libavcodec/version.h b/libavcodec/version.h
index efd5d34..4f92814 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -49,9 +49,6 @@
 #ifndef FF_API_REQUEST_CHANNELS
 #define FF_API_REQUEST_CHANNELS (LIBAVCODEC_VERSION_MAJOR < 56)
 #endif
-#ifndef FF_API_OLD_ENCODE_VIDEO
-#define FF_API_OLD_ENCODE_VIDEO (LIBAVCODEC_VERSION_MAJOR < 55)
-#endif
 #ifndef FF_API_MPV_GLOBAL_OPTS
 #define FF_API_MPV_GLOBAL_OPTS  (LIBAVCODEC_VERSION_MAJOR < 55)
 #endif