aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorMåns Rullgård <mans@mansr.com>2006-07-09 12:02:15 +0000
committerMåns Rullgård <mans@mansr.com>2006-07-09 12:02:15 +0000
commitaf9e7d181068a42272b290e48c43c343b492a349 (patch)
tree1bde651a37cc81e9dcb06406af4e098b588ac750 /libavcodec/h264.c
parent18769c0a7974a1ba7385eb030e4400046df5330d (diff)
downloadffmpeg-af9e7d181068a42272b290e48c43c343b492a349.tar.gz
--enable/disable parsers. Warning: some combinations are broken.
Originally committed as revision 5691 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index 8012ae1ead..ad25c7c99f 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -7872,6 +7872,7 @@ static int find_frame_end(H264Context *h, const uint8_t *buf, int buf_size){
return END_NOT_FOUND;
}
+#ifdef CONFIG_H264_PARSER
static int h264_parse(AVCodecParserContext *s,
AVCodecContext *avctx,
uint8_t **poutbuf, int *poutbuf_size,
@@ -7917,7 +7918,7 @@ static int h264_split(AVCodecContext *avctx,
}
return 0;
}
-
+#endif /* CONFIG_H264_PARSER */
static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
MpegEncContext * const s = &h->s;
@@ -8488,6 +8489,7 @@ AVCodec h264_decoder = {
.flush= flush_dpb,
};
+#ifdef CONFIG_H264_PARSER
AVCodecParser h264_parser = {
{ CODEC_ID_H264 },
sizeof(H264Context),
@@ -8496,5 +8498,6 @@ AVCodecParser h264_parser = {
ff_parse_close,
h264_split,
};
+#endif
#include "svq3.c"