summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-08-09 17:08:23 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-08-09 17:08:23 +0000
commit0587501517aa64be4999636b079ac3d5400658c8 (patch)
tree515b92d1e54b0125baf6c3f8921547669e3a04eb
parent6984879ed68d6edefb012ff5fd980168a314155c (diff)
downloadgst-libav-0587501517aa64be4999636b079ac3d5400658c8.tar.gz
ext/ffmpeg/gstffmpegcodecmap.c: Fix template to not allow fps=0.
Original commit message from CVS: * ext/ffmpeg/gstffmpegcodecmap.c: Fix template to not allow fps=0.
-rw-r--r--ChangeLog5
m---------common0
-rw-r--r--ext/ffmpeg/gstffmpegcodecmap.c2
3 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 79138d3..c1a6c73 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * ext/ffmpeg/gstffmpegcodecmap.c:
+ Fix template to not allow fps=0.
+
2005-08-05 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
* configure.ac:
diff --git a/common b/common
-Subproject 694de4dbf4827f372321f0634643a254d7edd98
+Subproject 856fbbfa88621ab67df141ead8d4d3df32c5c17
diff --git a/ext/ffmpeg/gstffmpegcodecmap.c b/ext/ffmpeg/gstffmpegcodecmap.c
index 78b5f49..c167933 100644
--- a/ext/ffmpeg/gstffmpegcodecmap.c
+++ b/ext/ffmpeg/gstffmpegcodecmap.c
@@ -94,7 +94,7 @@ gst_ffmpeg_set_palette (GstCaps *caps, AVCodecContext *context)
gst_caps_new_simple (mimetype, \
"width", GST_TYPE_INT_RANGE, 16, 4096, \
"height", GST_TYPE_INT_RANGE, 16, 4096, \
- "framerate", GST_TYPE_DOUBLE_RANGE, (double) 0., \
+ "framerate", GST_TYPE_DOUBLE_RANGE, (double) 1., \
G_MAXDOUBLE, \
__VA_ARGS__, NULL)