diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:07:09 +0200 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-01-15 05:57:31 +0200 |
| commit | 9bcd12fdf5c6f85e9bb391caa2713021624a957e (patch) | |
| tree | 375eac533ead90a45e7121e5ab307861b4ef52c8 /libmpcodecs/ve_xvid4.c | |
| parent | d419ecd161634e79dab3ac57d57c4bccba2adcdc (diff) | |
| parent | e0d66b140e1da7a793bff15003cadab79544b1dd (diff) | |
| download | mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.bz2 mpv-9bcd12fdf5c6f85e9bb391caa2713021624a957e.tar.xz | |
Merge svn changes up to r28310
The libdvdread4 and libdvdnav directories, which are externals in the
svn repository, are at least for now not included in any form. I added
configure checks to automatically disable internal libdvdread and
libdvdnav if the corresponding directories are not present; if they're
added manually then things work the same as in svn.
Diffstat (limited to 'libmpcodecs/ve_xvid4.c')
| -rw-r--r-- | libmpcodecs/ve_xvid4.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libmpcodecs/ve_xvid4.c b/libmpcodecs/ve_xvid4.c index 3e400eb9bd..2b55f7744f 100644 --- a/libmpcodecs/ve_xvid4.c +++ b/libmpcodecs/ve_xvid4.c @@ -78,7 +78,7 @@ typedef const struct { - char *name; ///< profile name + const char *name; ///< profile name int id; ///< mpeg-4 profile id; iso/iec 14496-2:2001 table G-1 int width; ///< profile width restriction int height; ///< profile height restriction @@ -100,7 +100,7 @@ typedef const struct /* default vbv_occupancy is (64/170)*vbv_buffer_size */ -static profile_t profiles[] = +static const profile_t profiles[] = { /* name p@l w h fps obj Tvmv vmv vcv ac% vbv pkt bps vbv_peak dbf flags */ /* unrestricted profile (default) */ @@ -139,7 +139,7 @@ static profile_t profiles[] = * \param str the profile name * \return pointer of the appropriate profiles array entry or NULL for a mistyped profile name */ -static profile_t *profileFromName(char *str) +static const profile_t *profileFromName(const char *str) { profile_t *cur = profiles; while (cur->name && strcasecmp(cur->name, str)) cur++; @@ -672,7 +672,7 @@ static int dispatch_settings(xvid_mplayer_module_t *mod) }; //profile is unrestricted as default - profile_t *selected_profile = profileFromName("unrestricted"); + const profile_t *selected_profile = profileFromName("unrestricted"); if(xvidenc_profile) selected_profile = profileFromName(xvidenc_profile); if(!selected_profile) |