X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavcodec%2Fbitstream.c;h=f0488cafd49c53e2c112e0018b587bcc965aacc2;hb=3749eede66c3774799766b1f246afae8a6ffc9bb;hp=7570fb2204c3ff0cc3464b0c76152566c1fdc454;hpb=b629deab3d42e6db5216d6c6ee054d2d70a4071e;p=ffmpeg diff --git a/libavcodec/bitstream.c b/libavcodec/bitstream.c index 7570fb2204c..f0488cafd49 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) { @@ -104,10 +93,10 @@ void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length) v = *(const uint16_t *)ptr; \ break; \ case 4: \ + default: \ + av_assert1(size == 4); \ v = *(const uint32_t *)ptr; \ break; \ - default: \ - av_assert1(0); \ } \ }