summaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-12-07 21:06:51 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2009-12-07 21:06:51 +0000
commit7f6458a700ca95aef7fdf8c7ebb5cbf9d858a1f2 (patch)
treefeaf7434b0c6eb423beed6a6de1773f28fa761f2 /libavcodec
parent80f472506010a32a4211e537063e853a96544d2f (diff)
downloadffmpeg-streaming-7f6458a700ca95aef7fdf8c7ebb5cbf9d858a1f2.zip
ffmpeg-streaming-7f6458a700ca95aef7fdf8c7ebb5cbf9d858a1f2.tar.gz
Make sure that compilation fails if functions like ff_put_string are used in code
that selected a bitstream writer for which they do not work. Originally committed as revision 20761 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/put_bits.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/put_bits.h b/libavcodec/put_bits.h
index 8a94a09..c013966 100644
--- 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.
OpenPOWER on IntegriCloud