Merge commit '9200514ad8717c63f82101dc394f4378854325bf'

[ffmpeg] / libavformat / idroqenc.c

diff --git a/libavformat/idroqenc.c b/libavformat/idroqenc.c
index 2ce4d7d4937903f9786a17e780647a5560f38b99..8122efef835d334f3315e277fe33da577d5e0368 100644 (file)
--- a/libavformat/idroqenc.c
+++ b/libavformat/idroqenc.c
@@ -2,20 +2,20 @@
  * id RoQ (.roq) File muxer
  * Copyright (c) 2007 Vitor Sessak
  *
- * This file is part of Libav.
+ * This file is part of FFmpeg.
  *
- * Libav is free software; you can redistribute it and/or
+ * FFmpeg is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
  * License as published by the Free Software Foundation; either
  * version 2.1 of the License, or (at your option) any later version.
  *
- * Libav is distributed in the hope that it will be useful,
+ * FFmpeg is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with Libav; if not, write to the Free Software
+ * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
  */
 
@@ -25,9 +25,34 @@
 
 static int roq_write_header(struct AVFormatContext *s)
 {
-    static const uint8_t header[] = {
-        0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, 0x1E, 0x00
+    uint8_t header[] = {
+        0x84, 0x10, 0xFF, 0xFF, 0xFF, 0xFF, /* fps: */ 0x1E, 0x00
     };
+    int n;
+
+// set the actual fps
+    for(n=0;n<s->nb_streams;n++) {
+        if (s->streams[n]->codecpar->codec_type == AVMEDIA_TYPE_VIDEO) {
+            unsigned int fps;
+
+            if (s->streams[n]->avg_frame_rate.den != 1) {
+                av_log(s, AV_LOG_ERROR, "Frame rate must be integer\n");
+                return AVERROR(EINVAL);
+            }
+
+            if ((fps=s->streams[n]->avg_frame_rate.num) > 255) {
+                av_log(s, AV_LOG_ERROR, "Frame rate may not exceed 255fps\n");
+                return AVERROR(EINVAL);
+            }
+
+            if (fps != 30) {
+                av_log(s, AV_LOG_WARNING, "For vintage compatibility fps must be 30\n");
+            }
+
+            header[6] = fps;
+            break;
+        }
+    }
 
     avio_write(s->pb, header, 8);
     avio_flush(s->pb);