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
e0aa5e77
Commit
e0aa5e77
authored
Aug 15, 2012
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dvenc: don't use deprecated AVCODEC_MAX_AUDIO_FRAME_SIZE
parent
8337b5db
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
dvenc.c
libavformat/dvenc.c
+4
-2
No files found.
libavformat/dvenc.c
View file @
e0aa5e77
...
...
@@ -38,6 +38,8 @@
#include "libavutil/fifo.h"
#include "libavutil/mathematics.h"
#define MAX_AUDIO_FRAME_SIZE 192000 // 1 second of 48khz 32bit audio
struct
DVMuxContext
{
const
DVprofile
*
sys
;
/* current DV profile, e.g.: 525/60, 625/50 */
int
n_ast
;
/* number of stereo audio streams (up to 2) */
...
...
@@ -255,7 +257,7 @@ static int dv_assemble_frame(DVMuxContext *c, AVStream* st,
for
(
i
=
0
;
i
<
c
->
n_ast
&&
st
!=
c
->
ast
[
i
];
i
++
);
/* FIXME: we have to have more sensible approach than this one */
if
(
av_fifo_size
(
c
->
audio_data
[
i
])
+
data_size
>=
100
*
AVCODEC_
MAX_AUDIO_FRAME_SIZE
)
if
(
av_fifo_size
(
c
->
audio_data
[
i
])
+
data_size
>=
100
*
MAX_AUDIO_FRAME_SIZE
)
av_log
(
st
->
codec
,
AV_LOG_ERROR
,
"Can't process DV frame #%d. Insufficient video data or severe sync problem.
\n
"
,
c
->
frames
);
av_fifo_generic_write
(
c
->
audio_data
[
i
],
data
,
data_size
,
NULL
);
...
...
@@ -343,7 +345,7 @@ static DVMuxContext* dv_init_mux(AVFormatContext* s)
c
->
start_time
=
ff_iso8601_to_unix_time
(
t
->
value
);
for
(
i
=
0
;
i
<
c
->
n_ast
;
i
++
)
{
if
(
c
->
ast
[
i
]
&&
!
(
c
->
audio_data
[
i
]
=
av_fifo_alloc
(
100
*
AVCODEC_
MAX_AUDIO_FRAME_SIZE
)))
{
if
(
c
->
ast
[
i
]
&&
!
(
c
->
audio_data
[
i
]
=
av_fifo_alloc
(
100
*
MAX_AUDIO_FRAME_SIZE
)))
{
while
(
i
>
0
)
{
i
--
;
av_fifo_free
(
c
->
audio_data
[
i
]);
...
...
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