summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTim-Philipp Müller <tim@centricular.net>2008-02-04 13:12:09 +0000
committerTim-Philipp Müller <tim@centricular.net>2008-02-04 13:12:09 +0000
commit8ab9eb5fa95a913a1a4ff9a773d0073b17b481f5 (patch)
tree63030b2fdb94d575e3c03b440cf06aa9bca06505
parentaa4139370a3f075b859f93f7c4a159ad5eca6c2d (diff)
downloadgst-plugins-bad-8ab9eb5fa95a913a1a4ff9a773d0073b17b481f5.tar.gz
gst-plugins-bad-8ab9eb5fa95a913a1a4ff9a773d0073b17b481f5.tar.bz2
gst-plugins-bad-8ab9eb5fa95a913a1a4ff9a773d0073b17b481f5.zip
ext/mpeg2enc/gstmpeg2encpicturereader.cc: Fix compilation with libmjpegtools 1.8.x.
Original commit message from CVS: * ext/mpeg2enc/gstmpeg2encpicturereader.cc: (GstMpeg2EncPictureReader.StreamPictureParams): Fix compilation with libmjpegtools 1.8.x.
-rw-r--r--ChangeLog6
-rw-r--r--ext/mpeg2enc/gstmpeg2encpicturereader.cc6
2 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index b2cfdf79..25ea91c1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-02-04 Tim-Philipp Müller <tim at centricular dot net>
+
+ * ext/mpeg2enc/gstmpeg2encpicturereader.cc:
+ (GstMpeg2EncPictureReader.StreamPictureParams):
+ Fix compilation with libmjpegtools 1.8.x.
+
2008-02-04 Sebastian Dröge <slomo@circular-chaos.org>
* ext/ladspa/gstsignalprocessor.c:
diff --git a/ext/mpeg2enc/gstmpeg2encpicturereader.cc b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
index 7b6cfbb7..35b599dd 100644
--- a/ext/mpeg2enc/gstmpeg2encpicturereader.cc
+++ b/ext/mpeg2enc/gstmpeg2encpicturereader.cc
@@ -97,9 +97,15 @@ GstMpeg2EncPictureReader::StreamPictureParams (MPEG2EncInVidParams & strm)
strm.aspect_ratio_code = mpeg_guess_mpeg_aspect_code (2, par,
strm.horizontal_size, strm.vertical_size);
+
+#ifdef GST_MJPEGTOOLS_19x
GST_DEBUG_OBJECT (element, "Guessing aspect ratio code for PAR %d/%d "
"MPEG version %d yielded: %d", par.n, par.d, mpeg_version,
strm.aspect_ratio_code);
+#else
+ GST_DEBUG_OBJECT (element, "Guessing aspect ratio code for PAR %d/%d "
+ "yielded: %d", par.n, par.d, strm.aspect_ratio_code);
+#endif
}
/*