From fc8406d01ed5266d9ffefa4f0b6319f966786bf9 Mon Sep 17 00:00:00 2001 From: Janne Grunau Date: Mon, 11 Mar 2013 13:29:39 +0100 Subject: [PATCH 1/2] avframe: copy reordered_opaque in copy_props Fixes video playback in applications still using reordered_opaque. --- libavutil/frame.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavutil/frame.c b/libavutil/frame.c index 7a2a4d183b..331e174745 100644 --- a/libavutil/frame.c +++ b/libavutil/frame.c @@ -373,6 +373,7 @@ int av_frame_copy_props(AVFrame *dst, const AVFrame *src) dst->opaque = src->opaque; dst->pkt_pts = src->pkt_pts; dst->pkt_dts = src->pkt_dts; + dst->reordered_opaque = src->reordered_opaque; dst->quality = src->quality; dst->coded_picture_number = src->coded_picture_number; dst->display_picture_number = src->display_picture_number; From d6d369bf1370999896500ae7eb5b9447ab635a3d Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Sun, 10 Mar 2013 23:03:42 +0100 Subject: [PATCH 2/2] atomic: prefer gcc builtins over win32 atomics, if available. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The mingw win32 atomics appear to be faulty, so they should not be used if the gcc ones are available. Signed-off-by: Martin Storsjö --- libavutil/atomic.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libavutil/atomic.h b/libavutil/atomic.h index 577e471462..773c5df1bd 100644 --- a/libavutil/atomic.h +++ b/libavutil/atomic.h @@ -23,10 +23,10 @@ #include "config.h" -#if HAVE_MEMORYBARRIER -#include "atomic_win32.h" -#elif HAVE_SYNC_VAL_COMPARE_AND_SWAP +#if HAVE_SYNC_VAL_COMPARE_AND_SWAP #include "atomic_gcc.h" +#elif HAVE_MEMORYBARRIER +#include "atomic_win32.h" #elif HAVE_MACHINE_RW_BARRIER #include "atomic_suncc.h" #else