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
c58846f3
Commit
c58846f3
authored
Apr 05, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: use align == 0 for default alignment in avcodec_fill_audio_frame()
Use default alignment in audio_get_buffer()
parent
0109a09d
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
4 deletions
+4
-4
avcodec.h
libavcodec/avcodec.h
+1
-1
utils.c
libavcodec/utils.c
+2
-2
version.h
libavcodec/version.h
+1
-1
No files found.
libavcodec/avcodec.h
View file @
c58846f3
...
@@ -3828,7 +3828,7 @@ int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
...
@@ -3828,7 +3828,7 @@ int avcodec_encode_audio2(AVCodecContext *avctx, AVPacket *avpkt,
* @param sample_fmt sample format
* @param sample_fmt sample format
* @param buf buffer to use for frame data
* @param buf buffer to use for frame data
* @param buf_size size of buffer
* @param buf_size size of buffer
* @param align plane size sample alignment
* @param align plane size sample alignment
(0 = default)
* @return 0 on success, negative error code on failure
* @return 0 on success, negative error code on failure
*/
*/
int
avcodec_fill_audio_frame
(
AVFrame
*
frame
,
int
nb_channels
,
int
avcodec_fill_audio_frame
(
AVFrame
*
frame
,
int
nb_channels
,
...
...
libavcodec/utils.c
View file @
c58846f3
...
@@ -292,7 +292,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
...
@@ -292,7 +292,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
buf_size
=
av_samples_get_buffer_size
(
NULL
,
avctx
->
channels
,
buf_size
=
av_samples_get_buffer_size
(
NULL
,
avctx
->
channels
,
frame
->
nb_samples
,
avctx
->
sample_fmt
,
frame
->
nb_samples
,
avctx
->
sample_fmt
,
32
);
0
);
if
(
buf_size
<
0
)
if
(
buf_size
<
0
)
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
...
@@ -334,7 +334,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
...
@@ -334,7 +334,7 @@ static int audio_get_buffer(AVCodecContext *avctx, AVFrame *frame)
}
}
if
((
ret
=
avcodec_fill_audio_frame
(
frame
,
avctx
->
channels
,
if
((
ret
=
avcodec_fill_audio_frame
(
frame
,
avctx
->
channels
,
avctx
->
sample_fmt
,
buf
->
data
[
0
],
avctx
->
sample_fmt
,
buf
->
data
[
0
],
buf
->
audio_data_size
,
32
)))
buf
->
audio_data_size
,
0
)))
return
ret
;
return
ret
;
if
(
frame
->
extended_data
==
frame
->
data
)
if
(
frame
->
extended_data
==
frame
->
data
)
...
...
libavcodec/version.h
View file @
c58846f3
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MAJOR 54
#define LIBAVCODEC_VERSION_MINOR 11
#define LIBAVCODEC_VERSION_MINOR 11
#define LIBAVCODEC_VERSION_MICRO
0
#define LIBAVCODEC_VERSION_MICRO
1
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
LIBAVCODEC_VERSION_MINOR, \
...
...
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