mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-23 10:11:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

Revert "avviddec: Fix memory leaks and assertions in error cases if we can't allocate a frame"

Browse source 
This reverts commit 47647e1cac.

Breaks playback when direct rendering is disabled.
The reason is that we set the opaque vaue to NULL and then try to use the NULL
value when we decoded a frame.
This commit is contained in:
Wim Taymans 2012-12-11 10:22:34 +01:00
parent 4fc452344a
commit 76b8b8c67f
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ext/libav/gstavviddec.c
View file

@ -485,7 +485,7 @@ static int
gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture) gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture)
{ {
GstVideoCodecFrame *frame; GstVideoCodecFrame *frame;
GstFFMpegVidDecVideoFrame *dframe = NULL; GstFFMpegVidDecVideoFrame *dframe;
GstFFMpegVidDec *ffmpegdec; GstFFMpegVidDec *ffmpegdec;
gint c; gint c;
GstVideoInfo *info; GstVideoInfo *info;
@ -583,10 +583,6 @@ invalid_frame:
} }
fallback: fallback:
{ {
if (dframe)
gst_ffmpegviddec_video_frame_free (dframe);
picture->opaque = NULL;
return avcodec_default_get_buffer (context, picture); return avcodec_default_get_buffer (context, picture);
} }
duplicate_frame: duplicate_frame:
@ -673,7 +669,6 @@ gst_ffmpegviddec_release_buffer (AVCodecContext * context, AVFrame * picture)
/* we remove the opaque data now */ /* we remove the opaque data now */
picture->opaque = NULL; picture->opaque = NULL;
if (frame)
gst_ffmpegviddec_video_frame_free (frame); gst_ffmpegviddec_video_frame_free (frame);
/* zero out the reference in ffmpeg */ /* zero out the reference in ffmpeg */