--- /dev/null
+From 25fee52c64caa7230a3c2b03467114e0c84fee67 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite <ospite@studenti.unina.it>
+Date: Sun, 28 Jul 2013 19:35:41 +0200
+Subject: [PATCH] Revert "am7xxx-play: switch to avcodec_encode_video2()"
+X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
+ ;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
+ !pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
+
+This reverts commit b344c71f3e03f912d8b6ee7d96cdd67b31cdf8cc.
+
+avcodec_encode_video2() has been introduced in lavc 54.01.0 but Debian Wheezy
+ships with lavc 53, so for now we should revert this change for the Debian
+packages.
+
+When this patch will be dropped maybe the package should depend on
+libavcodec54 as the old API may be disabled in the Debian packages.
+---
+ examples/am7xxx-play.c | 29 +++++++++--------------------
+ 1 file changed, 9 insertions(+), 20 deletions(-)
+
+diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
+index 3230e67..37d1191 100644
+--- a/examples/am7xxx-play.c
++++ b/examples/am7xxx-play.c
+@@ -285,12 +285,9 @@ static int am7xxx_play(const char *input_format_string,
+ int out_buf_size;
+ uint8_t *out_buf;
+ int out_picture_size;
+- uint8_t *out_picture;
+ struct SwsContext *sw_scale_ctx;
+ AVPacket in_packet;
+- AVPacket out_packet;
+ int got_picture;
+- int got_packet;
+ int ret;
+
+ ret = video_input_init(&input_ctx, input_format_string, input_path, input_options);
+@@ -393,26 +390,20 @@ static int am7xxx_play(const char *input_format_string,
+ picture_scaled->linesize);
+
+ if (output_ctx.raw_output) {
+- out_picture = out_buf;
+ out_picture_size = out_buf_size;
+ } else {
+ picture_scaled->quality = (output_ctx.codec_ctx)->global_quality;
+- av_init_packet(&out_packet);
+- out_packet.data = NULL;
+- out_packet.size = 0;
+- got_packet = 0;
+- ret = avcodec_encode_video2(output_ctx.codec_ctx,
+- &out_packet,
+- picture_scaled,
+- &got_packet);
+- if (ret < 0 || !got_packet) {
++ /* TODO: switch to avcodec_encode_video2() eventually */
++ out_picture_size = avcodec_encode_video(output_ctx.codec_ctx,
++ out_buf,
++ out_buf_size,
++ picture_scaled);
++ if (out_picture_size < 0) {
+ fprintf(stderr, "cannot encode video\n");
++ ret = out_picture_size;
+ run = 0;
+ goto end_while;
+ }
+-
+- out_picture = out_packet.data;
+- out_picture_size = out_packet.size;
+ }
+
+ #ifdef DEBUG
+@@ -423,7 +414,7 @@ static int am7xxx_play(const char *input_format_string,
+ else
+ snprintf(filename, NAME_MAX, "out.raw");
+ file = fopen(filename, "wb");
+- fwrite(out_picture, 1, out_picture_size, file);
++ fwrite(out_buf, 1, out_picture_size, file);
+ fclose(file);
+ #endif
+
+@@ -431,7 +422,7 @@ static int am7xxx_play(const char *input_format_string,
+ image_format,
+ (output_ctx.codec_ctx)->width,
+ (output_ctx.codec_ctx)->height,
+- out_picture,
++ out_buf,
+ out_picture_size);
+ if (ret < 0) {
+ perror("am7xxx_send_image");
+@@ -440,8 +431,6 @@ static int am7xxx_play(const char *input_format_string,
+ }
+ }
+ end_while:
+- if (!output_ctx.raw_output && got_packet)
+- av_free_packet(&out_packet);
+ av_free_packet(&in_packet);
+ }
+
+--
+1.8.3.2
+
+++ /dev/null
-From efddab9c02e7eae1e8bae843fe4d95718478de1b Mon Sep 17 00:00:00 2001
-From: Antonio Ospite <ospite@studenti.unina.it>
-Date: Thu, 14 Mar 2013 23:04:20 +0100
-Subject: [PATCH] doc: add a man page for am7xxx_mode_switch
-X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
- ;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
- !pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
-
----
- doc/man/CMakeLists.txt | 2 ++
- doc/man/am7xxx_mode_switch.1.txt | 57 ++++++++++++++++++++++++++++++++++++++
- 2 files changed, 59 insertions(+)
- create mode 100644 doc/man/am7xxx_mode_switch.1.txt
-
-diff --git a/doc/man/CMakeLists.txt b/doc/man/CMakeLists.txt
-index ed46999..a21e82c 100644
---- a/doc/man/CMakeLists.txt
-+++ b/doc/man/CMakeLists.txt
-@@ -3,6 +3,7 @@ find_package(Asciidoc)
- if(ASCIIDOC_FOUND)
- add_custom_target(manpages
- ${ASCIIDOC_A2X_EXECUTABLE} -f manpage ${CMAKE_CURRENT_SOURCE_DIR}/am7xxx-play.1.txt -D ${DOC_OUTPUT_PATH}/man
-+ COMMAND ${ASCIIDOC_A2X_EXECUTABLE} -f manpage ${CMAKE_CURRENT_SOURCE_DIR}/am7xxx_mode_switch.1.txt -D ${DOC_OUTPUT_PATH}/man
- COMMAND ${ASCIIDOC_A2X_EXECUTABLE} -f manpage ${CMAKE_CURRENT_SOURCE_DIR}/picoproj.1.txt -D ${DOC_OUTPUT_PATH}/man
- WORKING_DIRECTORY ${DOC_OUTPUT_PATH}/man
- COMMENT "Generating man pages with Asciidoc" VERBATIM
-@@ -17,6 +18,7 @@ if(ASCIIDOC_FOUND)
-
- install(FILES
- ${DOC_OUTPUT_PATH}/man/am7xxx-play.1
-+ ${DOC_OUTPUT_PATH}/man/am7xxx_mode_switch.1
- ${DOC_OUTPUT_PATH}/man/picoproj.1
- DESTINATION "${CMAKE_INSTALL_PREFIX}/share/man/man1/"
- COMPONENT manpages)
-diff --git a/doc/man/am7xxx_mode_switch.1.txt b/doc/man/am7xxx_mode_switch.1.txt
-new file mode 100644
-index 0000000..d80cb60
---- /dev/null
-+++ b/doc/man/am7xxx_mode_switch.1.txt
-@@ -0,0 +1,57 @@
-+AM7XXX_MODE_SWITCH(1)
-+=====================
-+:doctype: manpage
-+
-+
-+NAME
-+----
-+am7xxx_mode_switch - change the operational mode of am7xxx based devices
-+
-+
-+SYNOPSIS
-+--------
-+*am7xxx_mode_switch*
-+
-+
-+DESCRIPTION
-+-----------
-+am7xxx_mode_switch(1) is a minimal replacement of usb-modeswitch to use with
-+am7xxx devices (e.g. Acer C110 or Philips PPX projectors) to switch from the
-+mass storage device mode to the generic display mode.
-+
-+It is handy on systems where usb-modeswitch is not available, like Windows.
-+
-+
-+EXAMPLE OF USE
-+--------------
-+
-+am7xxx_mode_switch
-+
-+
-+EXIT STATUS
-+-----------
-+*0*::
-+ Success
-+
-+*!0*::
-+ Failure (libusb error)
-+
-+
-+AUTHORS
-+-------
-+Antonio Ospite
-+
-+
-+RESOURCES
-+---------
-+Main web site: <http://git.ao2.it/libam7xxx.git>
-+
-+
-+COPYING
-+-------
-+Copyright \(C) 2012 Antonio Ospite <ospite@studenti.unina.it>
-+
-+This program is free software: you can redistribute it and/or modify
-+it under the terms of the GNU General Public License as published by
-+the Free Software Foundation, either version 3 of the License, or
-+(at your option) any later version.
---
-1.7.10.4
-
+++ /dev/null
-From 70d093e78087c821c2c944df062f4a8ba10e2625 Mon Sep 17 00:00:00 2001
-From: Antonio Ospite <ospite@studenti.unina.it>
-Date: Mon, 18 Mar 2013 11:06:57 +0100
-Subject: [PATCH] Revert "am7xxx-play: switch to avcodec_encode_video2()"
-X-Face: z*RaLf`X<@C75u6Ig9}{oW$H;1_\2t5)({*|jhM<pyWR#k60!#=#>/Vb;]yA5<GWI5`6u&+
- ;6b'@y|8w"wB;4/e!7wYYrcqdJFY,~%Gk_4]cq$Ei/7<j&N3ah(m`ku?pX.&+~:_/wC~dwn^)MizBG
- !pE^+iDQQ1yC6^,)YDKkxDd!T>\I~93>J<_`<4)A{':UrE
-
-This reverts commit b344c71f3e03f912d8b6ee7d96cdd67b31cdf8cc.
-
-avcodec_encode_video2() has been introduced in lavc 54.01.0 but Debian Wheezy
-ships with lavc 53, so for now we should revert this change for the Debian
-packages.
-
-When this patch will be dropped maybe the package should depend on
-libavcodec54 as the old API may be disabled in the Debian packages.
-
----
- examples/am7xxx-play.c | 29 +++++++++--------------------
- 1 file changed, 9 insertions(+), 20 deletions(-)
-
-diff --git a/examples/am7xxx-play.c b/examples/am7xxx-play.c
-index 38812a4..0b1fa65 100644
---- a/examples/am7xxx-play.c
-+++ b/examples/am7xxx-play.c
-@@ -285,12 +285,9 @@ static int am7xxx_play(const char *input_format_string,
- int out_buf_size;
- uint8_t *out_buf;
- int out_picture_size;
-- uint8_t *out_picture;
- struct SwsContext *sw_scale_ctx;
- AVPacket in_packet;
-- AVPacket out_packet;
- int got_picture;
-- int got_packet;
- int ret = 0;
-
- ret = video_input_init(&input_ctx, input_format_string, input_path, input_options);
-@@ -393,26 +390,20 @@ static int am7xxx_play(const char *input_format_string,
- picture_scaled->linesize);
-
- if (output_ctx.raw_output) {
-- out_picture = out_buf;
- out_picture_size = out_buf_size;
- } else {
- picture_scaled->quality = (output_ctx.codec_ctx)->global_quality;
-- av_init_packet(&out_packet);
-- out_packet.data = NULL;
-- out_packet.size = 0;
-- got_packet = 0;
-- ret = avcodec_encode_video2(output_ctx.codec_ctx,
-- &out_packet,
-- picture_scaled,
-- &got_packet);
-- if (ret < 0 || !got_packet) {
-+ /* TODO: switch to avcodec_encode_video2() eventually */
-+ out_picture_size = avcodec_encode_video(output_ctx.codec_ctx,
-+ out_buf,
-+ out_buf_size,
-+ picture_scaled);
-+ if (out_picture_size < 0) {
- fprintf(stderr, "cannot encode video\n");
-+ ret = out_picture_size;
- run = 0;
- goto end_while;
- }
--
-- out_picture = out_packet.data;
-- out_picture_size = out_packet.size;
- }
-
- #ifdef DEBUG
-@@ -423,7 +414,7 @@ static int am7xxx_play(const char *input_format_string,
- else
- snprintf(filename, NAME_MAX, "out.raw");
- file = fopen(filename, "wb");
-- fwrite(out_picture, 1, out_picture_size, file);
-+ fwrite(out_buf, 1, out_picture_size, file);
- fclose(file);
- #endif
-
-@@ -431,7 +422,7 @@ static int am7xxx_play(const char *input_format_string,
- image_format,
- (output_ctx.codec_ctx)->width,
- (output_ctx.codec_ctx)->height,
-- out_picture,
-+ out_buf,
- out_picture_size);
- if (ret < 0) {
- perror("am7xxx_send_image");
-@@ -440,8 +431,6 @@ static int am7xxx_play(const char *input_format_string,
- }
- }
- end_while:
-- if (!output_ctx.raw_output)
-- av_free_packet(&out_packet);
- av_free_packet(&in_packet);
- }
-
---
-1.7.10.4
-
-0001-doc-add-a-man-page-for-am7xxx_mode_switch.patch
-0002-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch
+0001-Revert-am7xxx-play-switch-to-avcodec_encode_video2.patch
projects / libam7xxx.git / commitdiff