aboutsummaryrefslogtreecommitdiff
path: root/ext
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-09-18 11:49:43 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-09-18 11:49:43 +0200
commit8a55ca25e1e751b026ca2ae5d42c10f26d6b3ef5 (patch)
tree1c67274481b697b0398d90ba6de8fc30d56ea7e0 /ext
parent4beea29b9838daae059327b7d7e6b0409880abe8 (diff)
Imported Upstream version 0.11.99upstream/0.11.99
Diffstat (limited to 'ext')
-rw-r--r--ext/libav/gstavviddec.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/ext/libav/gstavviddec.c b/ext/libav/gstavviddec.c
index 588d2b2..c382832 100644
--- a/ext/libav/gstavviddec.c
+++ b/ext/libav/gstavviddec.c
@@ -574,6 +574,8 @@ gst_ffmpegviddec_get_buffer (AVCodecContext * context, AVFrame * picture)
/* GstFFMpegVidDecVideoFrame receives the frame ref */
picture->opaque = dframe = gst_ffmpegviddec_video_frame_new (frame);
+ GST_DEBUG_OBJECT (ffmpegdec, "storing opaque %p", dframe);
+
ffmpegdec->context->pix_fmt = context->pix_fmt;
/* see if we need renegotiation */
@@ -1323,9 +1325,10 @@ gst_ffmpegviddec_handle_frame (GstVideoDecoder * decoder,
gboolean do_padding;
GST_LOG_OBJECT (ffmpegdec,
- "Received new data of size %u, pts:%"
+ "Received new data of size %u, dts %" GST_TIME_FORMAT ", pts:%"
GST_TIME_FORMAT ", dur:%" GST_TIME_FORMAT,
gst_buffer_get_size (frame->input_buffer),
+ GST_TIME_ARGS (frame->dts),
GST_TIME_ARGS (frame->pts), GST_TIME_ARGS (frame->duration));
if (!gst_buffer_map (frame->input_buffer, &minfo, GST_MAP_READ)) {
@@ -1523,8 +1526,8 @@ gst_ffmpegviddec_decide_allocation (GstVideoDecoder * decoder, GstQuery * query)
avcodec_align_dimensions2 (ffmpegdec->context, &width, &height,
linesize_align);
edge =
- ffmpegdec->
- context->flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
+ ffmpegdec->context->
+ flags & CODEC_FLAG_EMU_EDGE ? 0 : avcodec_get_edge_width ();
/* increase the size for the padding */
width += edge << 1;
height += edge << 1;