ext/ffmpeg/gstffmpegmux.c: Properly convert buffer duration to an ffmpeg packet duration.

Original commit message from CVS:
Based on a patch by: Aurelien Grimaud <gstelzz at yahoo dot fr>
* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_collected):
Properly convert buffer duration to an ffmpeg packet duration.
Fixes #371939.
This commit is contained in:
Aurelien Grimaud 2008-07-06 21:06:45 +00:00 committed by Mark Nauwelaerts
parent 17e954b034
commit ffaf42c1df
3 changed files with 11 additions and 3 deletions

View file

@ -1,3 +1,11 @@
2008-07-06 Mark Nauwelaerts <mark.nauwelaerts@collabora.co.uk>
Based on a patch by: Aurelien Grimaud <gstelzz at yahoo dot fr>
* ext/ffmpeg/gstffmpegmux.c: (gst_ffmpegmux_collected):
Properly convert buffer duration to an ffmpeg packet duration.
Fixes #371939.
2008-07-01 Jan Schmidt <jan.schmidt@sun.com>
* ext/ffmpeg/gstffmpegdec.c:

2
common

@ -1 +1 @@
Subproject commit d9cd98b46aebaf143dc43d8563a3bff650be6a7e
Subproject commit 593bb114c6f5c32b529aa6443be4c2d60d6484c7

View file

@ -569,8 +569,8 @@ gst_ffmpegmux_collected (GstCollectPads * pads, gpointer user_data)
if (GST_BUFFER_DURATION_IS_VALID (buf))
pkt.duration =
gst_util_uint64_scale_int (GST_BUFFER_DURATION (buf), AV_TIME_BASE,
GST_SECOND);
gst_ffmpeg_time_gst_to_ff (GST_BUFFER_DURATION (buf),
ffmpegmux->context->streams[best_pad->padnum]->time_base);
else
pkt.duration = 0;
av_write_frame (ffmpegmux->context, &pkt);