Skip to content

Commit 6eefcf4

Browse files
author
Clement Champetier
committed
Merge branch 'master' of https://github.com/MarcAntoine-Arnaud/avTranscoder into dev_audioProcessing
2 parents fb7ea91 + b92a264 commit 6eefcf4

20 files changed

+2681
-61
lines changed

app/SConscript

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ avinfo = env.Program(
1919
'avformat',
2020
'avcodec',
2121
'swscale',
22+
'swresample',
2223
]
2324
)
2425

@@ -31,6 +32,7 @@ avmeta = env.Program(
3132
'avformat',
3233
'avcodec',
3334
'swscale',
35+
'swresample',
3436
]
3537
)
3638

@@ -43,6 +45,7 @@ avtransform = env.Program(
4345
'avformat',
4446
'avcodec',
4547
'swscale',
48+
'swresample',
4649
]
4750
)
4851

@@ -55,6 +58,7 @@ avprocessor = env.Program(
5558
'avformat',
5659
'avcodec',
5760
'swscale',
61+
'swresample',
5862
],
5963
CXXFLAGS = [
6064
'-std=c++0x'
@@ -71,6 +75,7 @@ audioRewrapper = env.Program(
7175
'avcodec',
7276
'swscale',
7377
'swresample',
78+
'swresample',
7479
]
7580
)
7681

@@ -84,6 +89,7 @@ if platform.system() != 'Windows':
8489
'avformat',
8590
'avcodec',
8691
'swscale',
92+
'swresample',
8793
'GL',
8894
'glut',
8995
]
@@ -97,7 +103,8 @@ if platform.system() != 'Windows':
97103
'avutil',
98104
'avformat',
99105
'avcodec',
100-
'swscale'
106+
'swscale',
107+
'swresample',
101108
],
102109
CXXFLAGS = [
103110
'-std=c++0x'

app/avplay/AvReader.hpp

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -93,9 +93,7 @@ class AvReader : public Reader
9393
// /std::cout << "seek at " << frame << std::endl;
9494
m_inputFile.seekAtFrame( frame );
9595
m_inputStreamVideo->flushDecoder();
96-
m_inputStreamVideo->readNextFrame( *m_sourceImage );
97-
m_colorTransform.convert( *m_sourceImage, *m_imageToDisplay );
98-
return (const char*)m_imageToDisplay->getPtr();
96+
return readNextFrame();
9997
}
10098

10199
void printMetadatas()

0 commit comments

Comments
 (0)