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
1d7ffd06
Commit
1d7ffd06
authored
Jan 13, 2013
by
Michael Niedermayer
Committed by
Martin Storsjö
Jan 14, 2013
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavc: Fix assignments in if() when calling ff_af_queue_add
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
59d56803
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
10 additions
and
10 deletions
+10
-10
aacenc.c
libavcodec/aacenc.c
+1
-1
libfaac.c
libavcodec/libfaac.c
+1
-1
libfdk-aacenc.c
libavcodec/libfdk-aacenc.c
+1
-1
libmp3lame.c
libavcodec/libmp3lame.c
+1
-1
libopencore-amr.c
libavcodec/libopencore-amr.c
+1
-1
libspeexenc.c
libavcodec/libspeexenc.c
+1
-1
libvo-aacenc.c
libavcodec/libvo-aacenc.c
+1
-1
libvorbis.c
libavcodec/libvorbis.c
+1
-1
nellymoserenc.c
libavcodec/nellymoserenc.c
+1
-1
ra144enc.c
libavcodec/ra144enc.c
+1
-1
No files found.
libavcodec/aacenc.c
View file @
1d7ffd06
...
...
@@ -518,7 +518,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
/* add current frame to queue */
if
(
frame
)
{
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
...
...
libavcodec/libfaac.c
View file @
1d7ffd06
...
...
@@ -200,7 +200,7 @@ static int Faac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
/* add current frame to the queue */
if
(
frame
)
{
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
...
...
libavcodec/libfdk-aacenc.c
View file @
1d7ffd06
...
...
@@ -334,7 +334,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
in_buf
.
bufElSizes
=
&
in_buffer_element_size
;
/* add current frame to the queue */
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
...
...
libavcodec/libmp3lame.c
View file @
1d7ffd06
...
...
@@ -236,7 +236,7 @@ static int mp3lame_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
/* add current frame to the queue */
if
(
frame
)
{
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
...
...
libavcodec/libopencore-amr.c
View file @
1d7ffd06
...
...
@@ -262,7 +262,7 @@ static int amr_nb_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
if
(
frame
->
nb_samples
<
avctx
->
frame_size
-
avctx
->
delay
)
s
->
enc_last_frame
=
-
1
;
}
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
{
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
{
av_freep
(
&
flush_buf
);
return
ret
;
}
...
...
libavcodec/libspeexenc.c
View file @
1d7ffd06
...
...
@@ -287,7 +287,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
speex_encode_stereo_int
(
samples
,
s
->
header
.
frame_size
,
&
s
->
bits
);
speex_encode_int
(
s
->
enc_state
,
samples
,
&
s
->
bits
);
s
->
pkt_frame_count
++
;
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
else
{
/* handle end-of-stream */
...
...
libavcodec/libvo-aacenc.c
View file @
1d7ffd06
...
...
@@ -157,7 +157,7 @@ static int aac_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
samples
=
(
VO_PBYTE
)
frame
->
data
[
0
];
}
/* add current frame to the queue */
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
...
...
libavcodec/libvorbis.c
View file @
1d7ffd06
...
...
@@ -279,7 +279,7 @@ static int oggvorbis_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
av_log
(
avctx
,
AV_LOG_ERROR
,
"error in vorbis_analysis_wrote()
\n
"
);
return
vorbis_error_to_averror
(
ret
);
}
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
else
{
if
(
!
s
->
eof
)
...
...
libavcodec/nellymoserenc.c
View file @
1d7ffd06
...
...
@@ -397,7 +397,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
if
(
frame
->
nb_samples
>=
NELLY_BUF_LEN
)
s
->
last_frame
=
1
;
}
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
s
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
else
{
memset
(
s
->
buf
+
NELLY_BUF_LEN
,
0
,
NELLY_SAMPLES
*
sizeof
(
*
s
->
buf
));
...
...
libavcodec/ra144enc.c
View file @
1d7ffd06
...
...
@@ -537,7 +537,7 @@ static int ra144_encode_frame(AVCodecContext *avctx, AVPacket *avpkt,
for
(;
i
<
frame
->
nb_samples
;
i
++
)
ractx
->
curr_block
[
i
]
=
samples
[
i
]
>>
2
;
if
((
ret
=
ff_af_queue_add
(
&
ractx
->
afq
,
frame
)
<
0
)
)
if
((
ret
=
ff_af_queue_add
(
&
ractx
->
afq
,
frame
)
)
<
0
)
return
ret
;
}
else
ractx
->
last_frame
=
1
;
...
...
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