mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-10-04 09:42:19 +00:00
Code Issues 1 Projects Releases Wiki Activity

ffenc_aac: Add profile and level to the caps

Browse source 
Fixes bug #650596.
This commit is contained in:
Sebastian Dröge 2011-05-27 10:54:12 +02:00
parent b8f7aab1ba
commit d1fac3e779
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ext/ffmpeg/Makefile.am
View file

@ -21,7 +21,7 @@ libgstffmpeg_la_SOURCES = gstffmpeg.c \
# gstffmpegscale.c # gstffmpegscale.c
libgstffmpeg_la_CFLAGS = $(FFMPEG_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) 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_LDFLAGS = $(GST_PLUGIN_LDFLAGS) $(DARWIN_LDFLAGS)
libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static libgstffmpeg_la_LIBTOOLFLAGS = --tag=disable-static

9
ext/ffmpeg/gstffmpegcodecmap.c
View file

@ -33,6 +33,8 @@
#include "gstffmpeg.h" #include "gstffmpeg.h"
#include "gstffmpegcodecmap.h" #include "gstffmpegcodecmap.h"
#include <gst/pbutils/codec-utils.h>
/* /*
* Read a palette from a caps. * 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); gst_caps_set_value (caps, "stream-format", &arr);
g_value_unset (&arr); g_value_unset (&arr);
} else { } 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; break;