diff options
| author | Andreas Rheinhardt <andreas.rheinhardt@gmail.com> | 2021-02-25 19:54:07 +0100 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2021-04-27 10:43:03 -0300 |
| commit | c197e3fe12154640f8234311382d82382c428936 (patch) | |
| tree | 6df0f943d3ffc7470131368964b266f2bfe8e9ba | |
| parent | d6cb7bf5995fe8af6ad79cf38a7aaa3b4fda6628 (diff) | |
| download | ffmpeg-c197e3fe12154640f8234311382d82382c428936.tar.gz | |
avcodec/bitstream: Remove avpriv PutBits API functions
Scheduled for removal in 717503f7166d7032e32b935f2819d450524125d1.
Also remove PutBitContext.size_in_bits which has been scheduled
for removal in e7cbbd90267de2a0ad1b5fa8ccb29ab7bf8a26b8.
Signed-off-by: Andreas Rheinhardt <andreas.rheinhardt@gmail.com>
Signed-off-by: James Almer <jamrial@gmail.com>
| -rw-r--r-- | libavcodec/bitstream.c | 11 | ||||
| -rw-r--r-- | libavcodec/put_bits.h | 10 | ||||
| -rw-r--r-- | libavcodec/version.h | 3 |
3 files changed, 0 insertions, 24 deletions
diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index e425ffdc96..f0488cafd4 100644 --- a/libavcodec/bitstream.c +++ b/libavcodec/bitstream.c @@ -45,17 +45,6 @@ const uint8_t ff_log2_run[41]={ 24, }; -#if FF_API_AVPRIV_PUT_BITS -void avpriv_align_put_bits(PutBitContext *s) -{ - align_put_bits(s); -} -void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length) -{ - ff_copy_bits(pb, src, length); -} -#endif - void ff_put_string(PutBitContext *pb, const char *string, int terminate_string) { while (*string) { diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h index 15c2650724..689c6b282e 100644 --- a/libavcodec/put_bits.h +++ b/libavcodec/put_bits.h @@ -33,8 +33,6 @@ #include "libavutil/intreadwrite.h" #include "libavutil/avassert.h" -#include "version.h" - #if ARCH_X86_64 // TODO: Benchmark and optionally enable on other 64-bit architectures. typedef uint64_t BitBuf; @@ -52,9 +50,6 @@ typedef struct PutBitContext { BitBuf bit_buf; int bit_left; uint8_t *buf, *buf_ptr, *buf_end; -#if LIBAVCODEC_VERSION_MAJOR < 59 - int size_in_bits; -#endif } PutBitContext; /** @@ -177,11 +172,6 @@ static inline void flush_put_bits_le(PutBitContext *s) s->bit_buf = 0; } -#if FF_API_AVPRIV_PUT_BITS -void avpriv_align_put_bits(PutBitContext *s); -void avpriv_copy_bits(PutBitContext *pb, const uint8_t *src, int length); -#endif - #ifdef BITSTREAM_WRITER_LE #define ff_put_string ff_put_string_unsupported_here #define ff_copy_bits ff_copy_bits_unsupported_here diff --git a/libavcodec/version.h b/libavcodec/version.h index 96f7e04108..376e4b21dc 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -93,9 +93,6 @@ #ifndef FF_API_UNUSED_CODEC_CAPS #define FF_API_UNUSED_CODEC_CAPS (LIBAVCODEC_VERSION_MAJOR < 59) #endif -#ifndef FF_API_AVPRIV_PUT_BITS -#define FF_API_AVPRIV_PUT_BITS (LIBAVCODEC_VERSION_MAJOR < 59) -#endif #ifndef FF_API_OLD_ENCDEC #define FF_API_OLD_ENCDEC (LIBAVCODEC_VERSION_MAJOR < 59) #endif |