update links with swresample library

MarcAntoine-Arnaud · MarcAntoine-Arnaud · commit f3e5d84d258c · 2014-06-06T16:39:54.000+02:00
diff --git a/app/SConscript b/app/SConscript
@@ -19,6 +19,7 @@ avinfo = env.Program(
                 'avformat',
                 'avcodec',
                 'swscale',
+                'swresample',
                 ]
         )
 
@@ -31,6 +32,7 @@ avmeta = env.Program(
                 'avformat',
                 'avcodec',
                 'swscale',
+                'swresample',
                 ]
         )
 
@@ -43,6 +45,7 @@ avtransform = env.Program(
                 'avformat',
                 'avcodec',
                 'swscale',
+                'swresample',
                 ]
         )
 
@@ -55,6 +58,7 @@ avprocessor = env.Program(
                 'avformat',
                 'avcodec',
                 'swscale',
+                'swresample',
                 ],
         CXXFLAGS = [
                 '-std=c++0x'
@@ -71,6 +75,7 @@ audioRewrapper = env.Program(
                 'avcodec',
                 'swscale',
                 'swresample',
+                'swresample',
                 ]
         )
 
@@ -84,6 +89,7 @@ if platform.system() != 'Windows':
                         'avformat',
                         'avcodec',
                         'swscale',
+                        'swresample',
                         'GL',
                         'glut',
                         ]
@@ -97,7 +103,8 @@ if platform.system() != 'Windows':
                         'avutil',
                         'avformat',
                         'avcodec',
-                        'swscale'
+                        'swscale',
+                        'swresample',
                         ],
                 CXXFLAGS = [
                         '-std=c++0x'
diff --git a/src/SConscript b/src/SConscript
@@ -16,23 +16,23 @@ sAvTranscoder = env.StaticLibrary(
     'sAvTranscoder',
     Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/DatasStructures/*.cpp' ) ,
     LIBS = [
-        'libavutil',
-        'libavcodec',
-        'libavformat',
-        'libswscale',
-        #'pthread',
+        'avutil',
+        'avcodec',
+        'avformat',
+        'swscale',
+        'swresample',
     ]
 )
 
 SharedAvTranscoder = env.SharedLibrary(
     'AvTranscoder',
     Glob( 'AvTranscoder/*.cpp' ) + Glob( 'AvTranscoder/DatasStructures/*.cpp' ) ,
     LIBS = [
-        'libavutil',
-        'libavcodec',
-        'libavformat',
-        'libswscale',
-        #'pthread',
+        'avutil',
+        'avcodec',
+        'avformat',
+        'swscale',
+        'swresample',
     ],
     SHLIBVERSION = AvTranscoderVersion,
 )
@@ -42,10 +42,11 @@ jAvTranscoder = envJava.SharedLibrary(
         source=['AvTranscoder/avTranscoder.i'],
         LIBS=[ 
             sAvTranscoder,
-            'libavutil',
-            'libavcodec',
-            'libavformat',
-            'libswscale',
+            'avutil',
+            'avcodec',
+            'avformat',
+            'swscale',
+            'swresample',
         ],
     )
 
@@ -54,10 +55,11 @@ pyAvTranscoder = envPy.SharedLibrary(
         source='AvTranscoder/avTranscoder.i',
         LIBS=[
             sAvTranscoder,
-            'libavutil',
-            'libavcodec',
-            'libavformat',
-            'libswscale',
+            'avutil',
+            'avcodec',
+            'avformat',
+            'swscale',
+            'swresample',
         ],
     )
 

Original file line number	Diff line number	Diff line change
`@@ -19,6 +19,7 @@ avinfo = env.Program(`
`19`	`19`	`'avformat',`
`20`	`20`	`'avcodec',`
`21`	`21`	`'swscale',`
	`22`	`+ 'swresample',`
`22`	`23`	`]`
`23`	`24`	`)`
`24`	`25`
`@@ -31,6 +32,7 @@ avmeta = env.Program(`
`31`	`32`	`'avformat',`
`32`	`33`	`'avcodec',`
`33`	`34`	`'swscale',`
	`35`	`+ 'swresample',`
`34`	`36`	`]`
`35`	`37`	`)`
`36`	`38`
`@@ -43,6 +45,7 @@ avtransform = env.Program(`
`43`	`45`	`'avformat',`
`44`	`46`	`'avcodec',`
`45`	`47`	`'swscale',`
	`48`	`+ 'swresample',`
`46`	`49`	`]`
`47`	`50`	`)`
`48`	`51`
`@@ -55,6 +58,7 @@ avprocessor = env.Program(`
`55`	`58`	`'avformat',`
`56`	`59`	`'avcodec',`
`57`	`60`	`'swscale',`
	`61`	`+ 'swresample',`
`58`	`62`	`],`
`59`	`63`	`CXXFLAGS = [`
`60`	`64`	`'-std=c++0x'`
`@@ -71,6 +75,7 @@ audioRewrapper = env.Program(`
`71`	`75`	`'avcodec',`
`72`	`76`	`'swscale',`
`73`	`77`	`'swresample',`
	`78`	`+ 'swresample',`
`74`	`79`	`]`
`75`	`80`	`)`
`76`	`81`
`@@ -84,6 +89,7 @@ if platform.system() != 'Windows':`
`84`	`89`	`'avformat',`
`85`	`90`	`'avcodec',`
`86`	`91`	`'swscale',`
	`92`	`+ 'swresample',`
`87`	`93`	`'GL',`
`88`	`94`	`'glut',`
`89`	`95`	`]`
`@@ -97,7 +103,8 @@ if platform.system() != 'Windows':`
`97`	`103`	`'avutil',`
`98`	`104`	`'avformat',`
`99`	`105`	`'avcodec',`
`100`		`- 'swscale'`
	`106`	`+ 'swscale',`
	`107`	`+ 'swresample',`
`101`	`108`	`],`
`102`	`109`	`CXXFLAGS = [`
`103`	`110`	`'-std=c++0x'`