Add workaround for zero width+height and ffmpeg >= 1.2.

3 files changed, 8 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ad4c4e3..4f59cec 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
 User johns
+Date:
+
+    Add workaround for zero width+height and ffmpeg >= 1.2.
+
+User johns
 Date: Sun Mar 17 15:52:42 CET 2013
 
     Release Version 0.6.0
diff --git a/Todo b/Todo
index cc36bcc..290f6eb 100644
--- a/Todo
+++ b/Todo
@@ -45,6 +45,7 @@ vdpau:
     software deinterlace path not working.
     OSD looses transparency, during channel switch.
     OSD looses transparency, while moving cut marks.
+    ffmpeg >=1.2 supports same API like VA-API.
 
 libva:
     yaepghd (VaapiSetOutputPosition) support
diff --git a/video.c b/video.c
index d4c9a5a..878eba9 100644
--- a/video.c
+++ b/video.c
@@ -152,11 +152,12 @@ typedef enum
 #include <libavcodec/vaapi.h>
 #include <libavutil/pixdesc.h>
 
-#if LIBAVCODEC_VERSION_INT == AV_VERSION_INT(54,86,100)
+#if LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(54,86,100)
     ///
     /// ffmpeg version 1.1.1 calls get_format with zero width and height
     /// for H264 codecs.
     /// since version 1.1.3 get_format is called twice.
+    /// ffmpeg 1.2 still buggy
     ///
 #define FFMPEG_BUG1_WORKAROUND		///< get_format bug workaround
 #endif