mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-20 23:36:38 +00:00
Code Issues 1 Projects Releases Wiki Activity

Rename gst_vaapi_decoder_ffmpeg_new_from_caps() to plain gst_vaapi_decoder_ffmpeg_new().

Browse source
This commit is contained in:
gb 2010-05-03 22:28:02 +00:00 committed by Gwenole Beauchesne
parent edae9f068c
commit f6314162e0
4 changed files with 4 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.c
View file

@ -608,33 +608,6 @@ gst_vaapi_decoder_ffmpeg_init(GstVaapiDecoderFfmpeg *decoder)
/** /**
* gst_vaapi_decoder_ffmpeg_new: * gst_vaapi_decoder_ffmpeg_new:
* @display: a #GstVaapiDisplay * @display: a #GstVaapiDisplay
* @codec: a #GstVaapiCodec
* @codec_data: an optional #GstBuffer holding extra codec data, or %NULL
*
* Creates a new #GstVaapiDecoder with the specified @codec bound to
* @display. @codec_data holds extra codec data like sequence headers.
*
* Return value: the newly allocated #GstVaapiDecoder object
*/
GstVaapiDecoder *
gst_vaapi_decoder_ffmpeg_new(
GstVaapiDisplay *display,
GstVaapiCodec codec,
GstBuffer *codec_data
)
{
g_return_val_if_fail(GST_VAAPI_IS_DISPLAY(display), NULL);
return g_object_new(GST_VAAPI_TYPE_DECODER_FFMPEG,
"display", display,
"codec", codec,
"codec-data", codec_data,
NULL);
}
/**
* st_vaapi_decoder_ffmpeg_new_from_caps:
* @display: a #GstVaapiDisplay
* @caps: a #GstCaps holding codec information * @caps: a #GstCaps holding codec information
* *
* Creates a new #GstVaapiDecoder based on FFmpeg where the codec is * Creates a new #GstVaapiDecoder based on FFmpeg where the codec is
@ -644,7 +617,7 @@ gst_vaapi_decoder_ffmpeg_new(
* Return value: the newly allocated #GstVaapiDecoder object * Return value: the newly allocated #GstVaapiDecoder object
*/ */
GstVaapiDecoder * GstVaapiDecoder *
gst_vaapi_decoder_ffmpeg_new_from_caps(GstVaapiDisplay *display, GstCaps *caps) gst_vaapi_decoder_ffmpeg_new(GstVaapiDisplay *display, GstCaps *caps)
{ {
GstVaapiDecoderFfmpeg *ffdecoder; GstVaapiDecoderFfmpeg *ffdecoder;

9
gst-libs/gst/vaapi/gstvaapidecoder_ffmpeg.h
View file

@ -80,14 +80,7 @@ GType
gst_vaapi_decoder_ffmpeg_get_type(void); gst_vaapi_decoder_ffmpeg_get_type(void);
GstVaapiDecoder * GstVaapiDecoder *
gst_vaapi_decoder_ffmpeg_new( gst_vaapi_decoder_ffmpeg_new(GstVaapiDisplay *display, GstCaps *caps);
GstVaapiDisplay *display,
GstVaapiCodec codec,
GstBuffer *codec_data
);
GstVaapiDecoder *
gst_vaapi_decoder_ffmpeg_new_from_caps(GstVaapiDisplay *display, GstCaps *caps);
G_END_DECLS G_END_DECLS

2
gst/vaapidecode/gstvaapidecode.c
View file

@ -178,7 +178,7 @@ gst_vaapidecode_create(GstVaapiDecode *decode)
if (decode->use_ffmpeg) if (decode->use_ffmpeg)
decode->decoder = decode->decoder =
gst_vaapi_decoder_ffmpeg_new_from_caps(display, decode->decoder_caps); gst_vaapi_decoder_ffmpeg_new(display, decode->decoder_caps);
return decode->decoder != NULL; return decode->decoder != NULL;
} }

2
tests/test-decode.c
View file

@ -126,7 +126,7 @@ main(int argc, char *argv[])
NULL NULL
); );
decoder = gst_vaapi_decoder_ffmpeg_new_from_caps(display, decoder_caps); decoder = gst_vaapi_decoder_ffmpeg_new(display, decoder_caps);
if (!decoder) if (!decoder)
g_error("could not create FFmpeg decoder"); g_error("could not create FFmpeg decoder");
gst_caps_unref(decoder_caps); gst_caps_unref(decoder_caps);