Update internal FFmpeg copy.

1 files changed, 3 insertions, 5 deletions

diff --git a/contrib/ffmpeg/libavcodec/w32thread.c b/contrib/ffmpeg/libavcodec/w32thread.c
index e749a64af..fbc0a581e 100644
--- a/contrib/ffmpeg/libavcodec/w32thread.c
+++ b/contrib/ffmpeg/libavcodec/w32thread.c
@@ -16,12 +16,10 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with FFmpeg; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- *
  */
 //#define DEBUG
 
 #include "avcodec.h"
-#include "common.h"
 
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -38,7 +36,7 @@ typedef struct ThreadContext{
 }ThreadContext;
 
 
-static unsigned __stdcall thread_func(void *v){
+static unsigned __stdcall attribute_align_arg thread_func(void *v){
     ThreadContext *c= v;
 
     for(;;){
@@ -57,8 +55,8 @@ static unsigned __stdcall thread_func(void *v){
 }
 
 /**
- * free what has been allocated by avcodec_thread_init().
- * must be called after decoding has finished, especially dont call while avcodec_thread_execute() is running
+ * Free what has been allocated by avcodec_thread_init().
+ * Must be called after decoding has finished, especially do not call while avcodec_thread_execute() is running.
  */
 void avcodec_thread_free(AVCodecContext *s){
     ThreadContext *c= s->thread_opaque;