...
 
Commits (10)
common @ 2585de99
Subproject commit 3baf58a140fb1219c917cbae1070c4734e30f028
Subproject commit 2585de990f508fc7fbe13a4b7c9fb08c68a10aed
......@@ -47,7 +47,7 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
GST_REQ=0.10.35.1
GST_REQ=0.10.36.1
ORC_REQ=0.4.6
dnl *** autotools stuff ****
......@@ -328,7 +328,15 @@ else
fi
# if we are cross-compiling, tell ffmpeg so
target_os=`echo $host_os | sed 's/-gnu//'`
case $host in
*android*)
target_os=linux
;;
*)
target_os=`echo $host_os | sed 's/-gnu//'`
;;
esac
if test "x$cross_compiling" = xyes; then
embffmpeg_configure_args="$embffmpeg_configure_args --enable-cross-compile \
--target-os=$target_os --arch=$host_cpu --cross-prefix=$host_alias-"
......
This diff is collapsed.
......@@ -117,7 +117,7 @@ gst_ffmpeg_formatid_to_caps (const gchar *format_name);
*/
GstCaps *
gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context, enum CodecID codec_id);
gst_ffmpeg_pixfmt_to_caps (enum PixelFormat pix_fmt, AVCodecContext * context, enum CodecID codec_id, gboolean encode);
/*
* _formatid_get_codecids () can be used to get the codecIDs
......
......@@ -307,7 +307,8 @@ gst_ffmpegvidenc_getcaps (GstVideoEncoder * encoder)
}
GST_DEBUG_OBJECT (ffmpegenc,
"Got an official pixfmt [%d], attempting to get caps", pixfmt);
tmpcaps = gst_ffmpeg_pixfmt_to_caps (pixfmt, NULL, oclass->in_plugin->id);
tmpcaps =
gst_ffmpeg_pixfmt_to_caps (pixfmt, NULL, oclass->in_plugin->id, TRUE);
if (tmpcaps) {
GST_DEBUG_OBJECT (ffmpegenc, "Got caps, breaking out");
if (!caps)
......