X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Finternal.h;h=ce4cf753d6afa1107f0b6ff690cd93e5caa4b68b;hb=69c344eed2742267541ddb748faee300bc8e97c3;hp=202f82d7e516aedb1b6b930ae45148b8be66a6b4;hpb=2e290d61147a084de86777c26c95908ce62e0033;p=ffmpeg

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index 202f82d7e51..ce4cf753d6a 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -48,12 +48,6 @@
 #define FF_CODEC_CAP_INIT_CLEANUP           (1 << 1)
 
 
-#ifdef DEBUG
-#   define ff_dlog(ctx, ...) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__)
-#else
-#   define ff_dlog(ctx, ...) do { if (0) av_log(ctx, AV_LOG_DEBUG, __VA_ARGS__); } while (0)
-#endif
-
 #ifdef TRACE
 #   define ff_tlog(ctx, ...) av_log(ctx, AV_LOG_TRACE, __VA_ARGS__)
 #else
@@ -120,14 +114,6 @@ typedef struct AVCodecInternal {
      */
     int allocate_progress;
 
-#if FF_API_OLD_ENCODE_AUDIO
-    /**
-     * Internal sample count used by avcodec_encode_audio() to fabricate pts.
-     * Can be removed along with avcodec_encode_audio().
-     */
-    int64_t sample_count;
-#endif
-
     /**
      * An audio frame with less than required samples has been submitted and
      * padded with silence. Reject all subsequent frames.
@@ -217,9 +203,14 @@ int avpriv_unlock_avformat(void);
  *                avpkt->size is set to the specified size.
  *                All other AVPacket fields will be reset with av_init_packet().
  * @param size    the minimum required packet size
- * @param min_size the smallest the packet might be down sized to, can be set to
- *                0, setting this roughly correctly allows the allocation code
- *                to choose between several allocation stragies to improve
+ * @param min_size This is a hint to the allocation algorithm, which indicates
+ *                to what minimal size the caller might later shrink the packet
+ *                to. Encoders often allocate packets which are larger than the
+ *                amount of data that is written into them as the exact amount is
+ *                not known at the time of allocation. min_size represents the
+ *                size a packet might be shrunk to by the caller. Can be set to
+ *                0. setting this roughly correctly allows the allocation code
+ *                to choose between several allocation strategies to improve
  *                speed slightly.
  * @return        non negative on success, negative error code on failure
  */