Mercurial > libavcore.hg
annotate parseutils.c @ 17:046c1e516605 libavcore
Add missing period in av_fill_image_max_pixstep() doxy.
author | stefano |
---|---|
date | Fri, 20 Aug 2010 16:34:41 +0000 |
parents | ae41a485a089 |
children |
rev | line source |
---|---|
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
1 /* |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
2 * This file is part of FFmpeg. |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
3 * |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
4 * FFmpeg is free software; you can redistribute it and/or |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
5 * modify it under the terms of the GNU Lesser General Public |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
6 * License as published by the Free Software Foundation; either |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
7 * version 2.1 of the License, or (at your option) any later version. |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
8 * |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
9 * FFmpeg is distributed in the hope that it will be useful, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
12 * Lesser General Public License for more details. |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
13 * |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
14 * You should have received a copy of the GNU Lesser General Public |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
15 * License along with FFmpeg; if not, write to the Free Software |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
17 */ |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
18 |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
19 /** |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
20 * @file |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
21 * misc parsing utilities for libavcore |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
22 */ |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
23 |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
24 #include "parseutils.h" |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
25 #include "libavutil/avutil.h" |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
26 |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
27 typedef struct { |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
28 const char *abbr; |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
29 int width, height; |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
30 } VideoSizeAbbr; |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
31 |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
32 typedef struct { |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
33 const char *abbr; |
4
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
34 AVRational rate; |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
35 } VideoRateAbbr; |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
36 |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
37 static const VideoSizeAbbr video_size_abbrs[] = { |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
38 { "ntsc", 720, 480 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
39 { "pal", 720, 576 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
40 { "qntsc", 352, 240 }, /* VCD compliant NTSC */ |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
41 { "qpal", 352, 288 }, /* VCD compliant PAL */ |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
42 { "sntsc", 640, 480 }, /* square pixel NTSC */ |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
43 { "spal", 768, 576 }, /* square pixel PAL */ |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
44 { "film", 352, 240 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
45 { "ntsc-film", 352, 240 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
46 { "sqcif", 128, 96 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
47 { "qcif", 176, 144 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
48 { "cif", 352, 288 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
49 { "4cif", 704, 576 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
50 { "16cif", 1408,1152 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
51 { "qqvga", 160, 120 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
52 { "qvga", 320, 240 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
53 { "vga", 640, 480 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
54 { "svga", 800, 600 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
55 { "xga", 1024, 768 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
56 { "uxga", 1600,1200 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
57 { "qxga", 2048,1536 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
58 { "sxga", 1280,1024 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
59 { "qsxga", 2560,2048 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
60 { "hsxga", 5120,4096 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
61 { "wvga", 852, 480 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
62 { "wxga", 1366, 768 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
63 { "wsxga", 1600,1024 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
64 { "wuxga", 1920,1200 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
65 { "woxga", 2560,1600 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
66 { "wqsxga", 3200,2048 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
67 { "wquxga", 3840,2400 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
68 { "whsxga", 6400,4096 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
69 { "whuxga", 7680,4800 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
70 { "cga", 320, 200 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
71 { "ega", 640, 350 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
72 { "hd480", 852, 480 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
73 { "hd720", 1280, 720 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
74 { "hd1080", 1920,1080 }, |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
75 }; |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
76 |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
77 static const VideoRateAbbr video_rate_abbrs[]= { |
4
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
78 { "ntsc", { 30000, 1001 } }, |
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
79 { "pal", { 25, 1 } }, |
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
80 { "qntsc", { 30000, 1001 } }, /* VCD compliant NTSC */ |
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
81 { "qpal", { 25, 1 } }, /* VCD compliant PAL */ |
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
82 { "sntsc", { 30000, 1001 } }, /* square pixel NTSC */ |
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
83 { "spal", { 25, 1 } }, /* square pixel PAL */ |
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
84 { "film", { 24, 1 } }, |
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
85 { "ntsc-film", { 24000, 1001 } }, |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
86 }; |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
87 |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
88 int av_parse_video_size(int *width_ptr, int *height_ptr, const char *str) |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
89 { |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
90 int i; |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
91 int n = FF_ARRAY_ELEMS(video_size_abbrs); |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
92 char *p; |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
93 int width = 0, height = 0; |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
94 |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
95 for (i = 0; i < n; i++) { |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
96 if (!strcmp(video_size_abbrs[i].abbr, str)) { |
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
97 width = video_size_abbrs[i].width; |
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
98 height = video_size_abbrs[i].height; |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
99 break; |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
100 } |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
101 } |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
102 if (i == n) { |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
103 p = str; |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
104 width = strtol(p, &p, 10); |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
105 if (*p) |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
106 p++; |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
107 height = strtol(p, &p, 10); |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
108 } |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
109 if (width <= 0 || height <= 0) |
2
b7595fe2d4a4
Make av_parse_video_size() and av_parse_video_rate() return
stefano
parents:
1
diff
changeset
|
110 return AVERROR(EINVAL); |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
111 *width_ptr = width; |
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
112 *height_ptr = height; |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
113 return 0; |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
114 } |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
115 |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
116 int av_parse_video_rate(AVRational *rate, const char *arg) |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
117 { |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
118 int i; |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
119 int n = FF_ARRAY_ELEMS(video_rate_abbrs); |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
120 char *cp; |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
121 |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
122 /* First, we check our abbreviation table */ |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
123 for (i = 0; i < n; ++i) |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
124 if (!strcmp(video_rate_abbrs[i].abbr, arg)) { |
4
a821459410ee
Make VideoFrameRateAbbr contain a rational rather than two ints for
stefano
parents:
3
diff
changeset
|
125 *rate = video_rate_abbrs[i].rate; |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
126 return 0; |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
127 } |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
128 |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
129 /* Then, we try to parse it as fraction */ |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
130 cp = strchr(arg, '/'); |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
131 if (!cp) |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
132 cp = strchr(arg, ':'); |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
133 if (cp) { |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
134 char *cpp; |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
135 rate->num = strtol(arg, &cpp, 10); |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
136 if (cpp != arg || cpp == cp) |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
137 rate->den = strtol(cp+1, &cpp, 10); |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
138 else |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
139 rate->num = 0; |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
140 } else { |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
141 /* Finally we give up and parse it as double */ |
5 | 142 *rate = av_d2q(strtod(arg, 0), 1001000); |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
143 } |
3
af138a6c3924
Remove reference to the "frame" term in variable names. Simpler and
stefano
parents:
2
diff
changeset
|
144 if (rate->num <= 0 || rate->den <= 0) |
2
b7595fe2d4a4
Make av_parse_video_size() and av_parse_video_rate() return
stefano
parents:
1
diff
changeset
|
145 return AVERROR(EINVAL); |
1
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
146 return 0; |
d2641c727ec5
Deprecate av_parse_video_frame_size() and av_parse_video_frame_rate()
stefano
parents:
diff
changeset
|
147 } |