Merge commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:27:37 +0000 (09:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 3 Aug 2013 07:27:37 +0000 (09:27 +0200)
* commit '3a7050ffed5ce061b114a11e4de4b77aba8efa0b':
  build: Add _Pragma macro to disable deprecated declaration warnings

Conflicts:
configure

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

diff --cc configure
+++ b/configure
@@@ -1491,16 -1317,10 +1491,17 @@@ HAVE_LIST=
      mprotect
      msvcrt
      nanosleep
 +    openjpeg_1_5_openjpeg_h
 +    PeekNamedPipe
 +    perl
 +    pod2man
      poll_h
      posix_memalign
+     pragma_deprecated
 +    pthread_cancel
      rdtsc
 +    rsync_contimeout
 +    sarestart
      sched_getaffinity
      sdl
      SetConsoleTextAttribute
Simple merge