summaryrefslogtreecommitdiff
path: root/video.c
diff options
context:
space:
mode:
authorJohns <johns98@gmx.net>2013-04-03 16:47:21 +0200
committerJohns <johns98@gmx.net>2013-04-03 16:47:21 +0200
commit23b0e0d599a89c549f50fbad939906f367630767 (patch)
tree4a7bbaa2c63d36fefd0a63f988922def187cae91 /video.c
parenteab051f5e6d2585089e0b332f3a92bf09e6a6b1f (diff)
downloadvdr-plugin-softhddevice-23b0e0d599a89c549f50fbad939906f367630767.tar.gz
vdr-plugin-softhddevice-23b0e0d599a89c549f50fbad939906f367630767.tar.bz2
Add workaround for zero width+height and ffmpeg >= 1.2.
Diffstat (limited to 'video.c')
-rw-r--r--video.c3
1 files changed, 2 insertions, 1 deletions
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