mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-18 22:36:33 +00:00
parent
b8f7aab1ba
commit
d1fac3e779
2 changed files with 9 additions and 2 deletions
|
@ -21,7 +21,7 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
|
|||
# gstffmpegscale.c
|
||||
|
||||
libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
|
||||
libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS)
|
||||
libgstffmpeg_la_LIBADD = $(FFMPEG_LIBS) $(GST_BASE_LIBS) $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lgstpbutils-$(GST_MAJORMINOR) $(LIBM) $(WIN32_LIBS) -lz $(BZ2_LIBS)
|
||||
libgstffmpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
|
||||
libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
|
||||
|
|
|
@ -33,6 +33,8 @@
|
|||
#include "gstffmpeg.h"
|
||||
#include "gstffmpegcodecmap.h"
|
||||
|
||||
#include <gst/pbutils/codec-utils.h>
|
||||
|
||||
/*
|
||||
* Read a palette from a caps.
|
||||
*/
|
||||
|
@ -979,7 +981,12 @@ gst_ffmpeg_codecid_to_caps (enum CodecID codec_id,
|
|||
gst_caps_set_value (caps, "stream-format", &arr);
|
||||
g_value_unset (&arr);
|
||||
} else {
|
||||
gst_caps_set_simple (caps, "stream-format", G_TYPE_STRING, "raw", NULL);
|
||||
gst_caps_set_simple (caps, "stream-format", G_TYPE_STRING, "raw",
|
||||
"base-profile", G_TYPE_STRING, "lc", NULL);
|
||||
|
||||
if (context && context->extradata_size > 0)
|
||||
gst_codec_utils_aac_caps_set_level_and_profile (caps,
|
||||
context->extradata, context->extradata_size);
|
||||
}
|
||||
|
||||
break;
|
||||
|
|
Loading…
Reference in a new issue