Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
c6736713
Commit
c6736713
authored
Jan 31, 2012
by
Clément Bœsch
Committed by
Clément Bœsch
Jan 31, 2012
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: fix -map_channel being ignored when resampling is not needed.
parent
151ecc2a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
ffmpeg.c
ffmpeg.c
+1
-1
No files found.
ffmpeg.c
View file @
c6736713
...
@@ -1245,7 +1245,7 @@ need_realloc:
...
@@ -1245,7 +1245,7 @@ need_realloc:
ost
->
sync_opts
=
lrintf
(
get_sync_ipts
(
ost
)
*
enc
->
sample_rate
)
-
ost
->
sync_opts
=
lrintf
(
get_sync_ipts
(
ost
)
*
enc
->
sample_rate
)
-
av_fifo_size
(
ost
->
fifo
)
/
(
enc
->
channels
*
osize
);
// FIXME wrong
av_fifo_size
(
ost
->
fifo
)
/
(
enc
->
channels
*
osize
);
// FIXME wrong
if
(
ost
->
audio_resample
)
{
if
(
ost
->
audio_resample
||
ost
->
audio_channels_mapped
)
{
buftmp
=
audio_buf
;
buftmp
=
audio_buf
;
size_out
=
swr_convert
(
ost
->
swr
,
(
uint8_t
*
[]){
buftmp
},
audio_buf_size
/
(
enc
->
channels
*
osize
),
size_out
=
swr_convert
(
ost
->
swr
,
(
uint8_t
*
[]){
buftmp
},
audio_buf_size
/
(
enc
->
channels
*
osize
),
(
const
uint8_t
*
[]){
buf
},
size
/
(
dec
->
channels
*
isize
));
(
const
uint8_t
*
[]){
buf
},
size
/
(
dec
->
channels
*
isize
));
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment