Merge commit '09f2581dc5edb3642858d69d9a70b67e249167e9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 13:50:59 +0000 (15:50 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 13:51:27 +0000 (15:51 +0200)
* commit '09f2581dc5edb3642858d69d9a70b67e249167e9':
  msvc/icl: Use __declspec(deprecated)

Conflicts:
configure

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
configure
libavutil/internal.h

diff --cc configure
+++ b/configure
@@@ -2753,8 -2417,7 +2753,8 @@@ msvc_flags()
              -Wall)                echo -W4 -wd4244 -wd4127 -wd4018 -wd4389     \
                                         -wd4146 -wd4057 -wd4204 -wd4706 -wd4305 \
                                         -wd4152 -wd4324 -we4013 -wd4100 -wd4214 \
-                                        -wd4996 -wd4273 ;;
 +                                       -wd4554 \
+                                        -wd4273 ;;
          esac
      done
  }
Simple merge