aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorAlex Beregszaszi <alex@rtfs.hu>2007-04-21 00:36:53 +0000
committerAlex Beregszaszi <alex@rtfs.hu>2007-04-21 00:36:53 +0000
commit4ea385bbbc9cd4f64b851c483e4be572b8a50640 (patch)
treed1a847b084ef8824bfe87f39659bd8ce48b44124 /libavcodec
parentddec67e8b18573b8f4532d1507270b92f8a7c9a5 (diff)
downloadffmpeg-4ea385bbbc9cd4f64b851c483e4be572b8a50640.tar.gz
compile mjpeg parser if requested
Originally committed as revision 8766 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpeg.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpeg.c b/libavcodec/mjpeg.c
index 73158476bb..63df4a64b3 100644
--- a/libavcodec/mjpeg.c
+++ b/libavcodec/mjpeg.c
@@ -2626,6 +2626,7 @@ AVCodec ljpeg_encoder = { //FIXME avoid MPV_* lossless jpeg shouldnt need them
};
#endif
+#ifdef CONFIG_MJPEG_PARSER
AVCodecParser mjpeg_parser = {
{ CODEC_ID_MJPEG },
sizeof(ParseContext),
@@ -2633,6 +2634,7 @@ AVCodecParser mjpeg_parser = {
jpeg_parse,
ff_parse_close,
};
+#endif
AVBitStreamFilter mjpega_dump_header_bsf = {
"mjpegadump",