From e691b17f2c134d1380f3c5d3dc25b3ec1ac9106f Mon Sep 17 00:00:00 2001 From: Antonio Ospite Date: Tue, 17 Nov 2015 15:46:15 +0100 Subject: [PATCH 1/1] Strip trailing spaces here and there --- contrib/am7xxx-play-window.sh | 6 +++--- examples/CMakeLists.txt | 4 ++-- src/am7xxx.h | 2 +- src/portable_endian.h | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/contrib/am7xxx-play-window.sh b/contrib/am7xxx-play-window.sh index 2978ef2..dd8703d 100755 --- a/contrib/am7xxx-play-window.sh +++ b/contrib/am7xxx-play-window.sh @@ -13,13 +13,13 @@ set -e DISPLAY=":0" - + WIN_INFO="$(xwininfo)" - + X=$(echo "$WIN_INFO" | sed -n -e "/^[[:space:]]*Absolute upper-left X:[[:space:]]*/s///p") Y=$(echo "$WIN_INFO" | sed -n -e "/^[[:space:]]*Absolute upper-left Y:[[:space:]]*/s///p") WIDTH=$(echo "$WIN_INFO" | sed -n -e "/^[[:space:]]*Width:[[:space:]]*/s///p") HEIGHT=$(echo "$WIN_INFO" | sed -n -e "/^[[:space:]]*Height:[[:space:]]*/s///p") - + set -x am7xxx-play -f x11grab -i "${DISPLAY}+${X},${Y}" -o video_size="${WIDTH}x${HEIGHT}" diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt index e4da954..c563f5f 100644 --- a/examples/CMakeLists.txt +++ b/examples/CMakeLists.txt @@ -18,8 +18,8 @@ endif() option(BUILD_AM7XXX-PLAY "Build a more complete example: am7xxx-play" TRUE) if(BUILD_AM7XXX-PLAY) find_package(FFmpeg REQUIRED) - set(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES}) - set(CMAKE_REQUIRED_INCLUDES ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}) + set(CMAKE_REQUIRED_LIBRARIES ${FFMPEG_LIBRARIES}) + set(CMAKE_REQUIRED_INCLUDES ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}) check_symbol_exists(avformat_open_input "${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat/avformat.h" HAVE_AVFORMAT_OPEN_INPUT) diff --git a/src/am7xxx.h b/src/am7xxx.h index 4a97f69..d103c22 100644 --- a/src/am7xxx.h +++ b/src/am7xxx.h @@ -252,7 +252,7 @@ int am7xxx_send_image(am7xxx_device *dev, * This is the function that actually makes the device display something. * Static pictures can be sent just once and the device will keep showing them * until another image get sent or some command resets or turns off the display. - * + * * @note This _async() variant makes a copy of the image buffer, so the caller * is free to reuse the buffer just after the function returns. * diff --git a/src/portable_endian.h b/src/portable_endian.h index 1741f18..6bc9a73 100644 --- a/src/portable_endian.h +++ b/src/portable_endian.h @@ -1,4 +1,4 @@ -/* +/* * Public domain, stripped down version of: * https://gist.github.com/panzi/6856583 */ -- 2.1.4