[SCM] libquicktime/master: Remove 22-spelling_errors.patch, applied upstream.
alessio at users.alioth.debian.org
alessio at users.alioth.debian.org
Sat Jul 9 08:30:42 UTC 2011
The following commit has been merged in the master branch:
commit 013c6a07a62bacfb59b6b7c62d21a6e65d13f39d
Author: Alessio Treglia <alessio at debian.org>
Date: Sat Jul 9 10:30:58 2011 +0200
Remove 22-spelling_errors.patch, applied upstream.
diff --git a/debian/patches/22-spelling_errors.patch b/debian/patches/22-spelling_errors.patch
deleted file mode 100644
index 4c60a99..0000000
--- a/debian/patches/22-spelling_errors.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: Correct some misspellings.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: Burkhard Plaum <plaum at ipf.uni-stuttgart.de>
----
- plugins/ffmpeg/params.h | 2 +-
- plugins/mjpeg/lqt_mjpeg.c | 2 +-
- utils/lqtplay.c | 8 ++++----
- 3 files changed, 6 insertions(+), 6 deletions(-)
-
---- libquicktime.orig/utils/lqtplay.c
-+++ libquicktime/utils/lqtplay.c
-@@ -1040,7 +1040,7 @@ static int qt_init_video(void)
- qt_rows[i] = qt_frame + qt_width * 3 * i;
- break;
- case BC_YUV422:
-- fprintf(stderr,_("INFO: using BC_YUV422 + Xvideo extention\n"));
-+ fprintf(stderr,_("INFO: using BC_YUV422 + Xvideo extension\n"));
- qt_xvimage = xv_create_ximage(dpy,qt_width,qt_height,
- xv_port,FOURCC_YUV2);
- for (i = 0; i < qt_height; i++)
-@@ -1053,7 +1053,7 @@ static int qt_init_video(void)
- if(xv_have_YV12)
- {
- fprintf(stderr,
-- _("INFO: using BC_YUV420P + Xvideo extention (YV12)\n"));
-+ _("INFO: using BC_YUV420P + Xvideo extension (YV12)\n"));
- qt_xvimage = xv_create_ximage(dpy,qt_width,qt_height,
- xv_port,FOURCC_YV12);
- qt_rows[0] = (uint8_t*)(qt_xvimage->data + qt_xvimage->offsets[0]);
-@@ -1063,7 +1063,7 @@ static int qt_init_video(void)
- else if(xv_have_I420)
- {
- fprintf(stderr,
-- _("INFO: using BC_YUV420P + Xvideo extention (I420)\n"));
-+ _("INFO: using BC_YUV420P + Xvideo extension (I420)\n"));
- qt_xvimage = xv_create_ximage(dpy,qt_width,qt_height,
- xv_port,FOURCC_I420);
- qt_rows[0] = (uint8_t*)(qt_xvimage->data + qt_xvimage->offsets[0]);
-@@ -1508,7 +1508,7 @@ static void usage(FILE *fp, char *prog)
- "\n"
- "usage: %s [ options ] <file>\n"
- "options:\n"
-- " -noxv don't use the Xvideo extention\n"
-+ " -noxv don't use the Xvideo extension\n"
- " -nogl don't use OpenGL\n"
- " -noalsa don't use Alsa\n"
- "\n"),
---- libquicktime.orig/plugins/ffmpeg/params.h
-+++ libquicktime/plugins/ffmpeg/params.h
-@@ -216,7 +216,7 @@ the spec or reference software\n \
- 1: Strictly conform to all the things in the spec no \
- matter what consequences\n \
- 0: Default\n \
---1: Allow inofficial extensions\n \
-+-1: Allow unofficial extensions\n \
- -2: Allow non standarized experimental things") \
- }
-
---- libquicktime.orig/plugins/mjpeg/lqt_mjpeg.c
-+++ libquicktime/plugins/mjpeg/lqt_mjpeg.c
-@@ -62,7 +62,7 @@ static lqt_codec_info_static_t codec_inf
- {
- .name = "jpeg",
- .long_name = TRS("JPEG photo"),
-- .description = TRS("This format writes a seperate JPEG photo for \
-+ .description = TRS("This format writes a separate JPEG photo for \
- every frame in YUV 4:2:0"),
- .fourccs = fourccs_jpeg,
- .type = LQT_CODEC_VIDEO,
diff --git a/debian/patches/series b/debian/patches/series
index 8b93bb0..8294538 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
02-install-in-libquicktime2.patch
-22-spelling_errors.patch
23-manpage_errors.patch
30-libav-0.7.patch
--
libquicktime packaging
More information about the pkg-multimedia-commits
mailing list