aacsbr: Make the previous value of bs_num_env local to read_sbr_data().

[ffmpeg] / libavcodec / put_bits.h

diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index 5f9811e8fc92dea66be8b482ee53a8a5bdf62753..c0139661a504996d8bbd4f34cfdf54d52dd59d2b 100644 (file)
--- a/libavcodec/put_bits.h
+++ b/libavcodec/put_bits.h
@@ -117,6 +117,11 @@ static inline void flush_put_bits(PutBitContext *s)
 #endif
 }
 
+#if defined(ALT_BITSTREAM_WRITER) || defined(BITSTREAM_WRITER_LE)
+#define align_put_bits align_put_bits_unsupported_here
+#define ff_put_string ff_put_string_unsupported_here
+#define ff_copy_bits ff_copy_bits_unsupported_here
+#else
 /**
  * Pads the bitstream with zeros up to the next byte boundary.
  */
@@ -135,6 +140,7 @@ void ff_put_string(PutBitContext *pb, const char *string, int terminate_string);
  * @param length the number of bits of src to copy
  */
 void ff_copy_bits(PutBitContext *pb, const uint8_t *src, int length);
+#endif
 
 /**
  * Writes up to 31 bits into a bitstream.
@@ -270,7 +276,7 @@ static void av_unused put_bits32(PutBitContext *s, uint32_t value)
 {
     int lo = value & 0xffff;
     int hi = value >> 16;
-#ifdef ALT_BITSTREAM_WRITER_LE
+#ifdef BITSTREAM_WRITER_LE
     put_bits(s, 16, lo);
     put_bits(s, 16, hi);
 #else