mirror of
https://git.freebsd.org/ports.git
synced 2025-06-08 22:30:38 -04:00
7abf753080
- Update to 0.30 - Remove patch-ffmpeg2 (not needed now that 0.30 uses new FFmpeg API) - Tidy up remaining patches (pet portlint) Changes this release: https://git.xiph.org/?p=ffmpeg2theora.git;a=blob;f=ChangeLog;h=7b2c20e19e4ca6d042d8f2bb3d4491e513d422fa;hb=ff86d204adf335b6314ef568b08d4af8799f108d This new version also allows ffmpeg2theora to build successfully once multimedia/ffmpeg is updated to 3.0.x. Note that multimedia/ffmpeg is currently still on the 2.8.x branch, however this update is backwards compatible with ffmpeg 2.8.x. PR: 209375 Approved by: wg (maintainer timeout), mat (mentor) Differential Revision: https://reviews.freebsd.org/D6784
11 lines
418 B
C
11 lines
418 B
C
--- src/subtitles.c.orig 2016-01-10 04:35:56 UTC
|
|
+++ src/subtitles.c
|
|
@@ -284,7 +284,7 @@ static char *convert_subtitle_to_utf8(co
|
|
return NULL;
|
|
}
|
|
outptr=newtext;
|
|
- if (iconv(cd, &inptr, &insz, &outptr, &outsz) < 0) {
|
|
+ if (iconv(cd, &inptr, &insz, &outptr, &outsz) == (size_t)-1) {
|
|
warn(frontend, NULL, 0, "Failed to convert text to UTF-8\n");
|
|
free(newtext);
|
|
newtext = NULL;
|