From: Reto Schneider <github@reto-schneider.ch>
Date: Tue, 20 Mar 2012 18:55:27 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/unstable' into rettichschnidi
X-Git-Tag: v0.1.0~1^2~9^2~8
X-Git-Url: https://git.ao2.it/libam7xxx.git/commitdiff_plain/fd6ced5284750470f40d08a5b3b11d4931d6dc2f?hp=7c12ee7bab2847c89104dbec43ea5cec481ed1a1

Merge remote-tracking branch 'origin/unstable' into rettichschnidi
---

diff --git a/README.asciidoc b/README.asciidoc
index 0d878bc..133c13b 100644
--- a/README.asciidoc
+++ b/README.asciidoc
@@ -46,7 +46,7 @@ manually with the command:
 
 Examples of devices based on AM7XXX are:
 
-  - Acer Series C pico projectors (C20 C110 C112):
+  - Acer Series C pico projectors (C20, C110, C112):
       * http://www.acer.it/ac/it/IT/content/models/projector-c
       * http://support.acer.com/product/default.aspx?modelId=3888
     
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index c70d121..234e666 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -28,7 +28,7 @@ endif()
 add_executable(am7xxx-play am7xxx-play.c)
 
 target_link_libraries(am7xxx-play am7xxx
-  ${FFMPEG_LIBAVDEVICE_LIBRARIES}
+  ${FFMPEG_LIBRARIES}
   ${FFMPEG_LIBSWSCALE_LIBRARIES}
   ${LIBXCB_LIBRARIES})
 install(TARGETS am7xxx-play
diff --git a/src/am7xxx.c b/src/am7xxx.c
index a8bcc49..883794b 100644
--- a/src/am7xxx.c
+++ b/src/am7xxx.c
@@ -244,6 +244,7 @@ static void debug_dump_header(am7xxx_context *ctx, struct am7xxx_header *h)
 	(void)ctx;
 	(void)h;
 }
+
 static void trace_dump_buffer(am7xxx_context *ctx, const char *message,
 			      uint8_t *buffer, unsigned int len)
 {