Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Open sidebar
BC
public
external
ffmpeg
Commits
5b9c3b45
Commit
5b9c3b45
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Replace all instances of avcodec_alloc_frame() with av_frame_alloc().
parent
2ff302cb
Changes
18
Hide whitespace changes
Inline
Side-by-side
Showing
18 changed files
with
23 additions
and
23 deletions
+23
-23
avconv.c
avconv.c
+2
-2
avplay.c
avplay.c
+1
-1
libavcodec/alacenc.c
libavcodec/alacenc.c
+1
-1
libavcodec/api-example.c
libavcodec/api-example.c
+4
-4
libavcodec/libopenjpegenc.c
libavcodec/libopenjpegenc.c
+1
-1
libavcodec/libtheoraenc.c
libavcodec/libtheoraenc.c
+1
-1
libavcodec/libvpxenc.c
libavcodec/libvpxenc.c
+1
-1
libavcodec/pcm.c
libavcodec/pcm.c
+1
-1
libavcodec/proresenc.c
libavcodec/proresenc.c
+1
-1
libavcodec/svq1dec.c
libavcodec/svq1dec.c
+1
-1
libavcodec/utils.c
libavcodec/utils.c
+1
-1
libavcodec/utvideoenc.c
libavcodec/utvideoenc.c
+1
-1
libavcodec/v210enc.c
libavcodec/v210enc.c
+1
-1
libavcodec/v410enc.c
libavcodec/v410enc.c
+1
-1
libavcodec/xbmenc.c
libavcodec/xbmenc.c
+1
-1
libavcodec/xwdenc.c
libavcodec/xwdenc.c
+1
-1
libavformat/output-example.c
libavformat/output-example.c
+2
-2
libavformat/utils.c
libavformat/utils.c
+1
-1
No files found.
avconv.c
View file @
5b9c3b45
...
...
@@ -637,7 +637,7 @@ static int poll_filter(OutputStream *ost)
AVFrame
*
filtered_frame
=
NULL
;
int
frame_size
,
ret
;
if
(
!
ost
->
filtered_frame
&&
!
(
ost
->
filtered_frame
=
av
codec_alloc
_frame
()))
{
if
(
!
ost
->
filtered_frame
&&
!
(
ost
->
filtered_frame
=
av_frame
_alloc
()))
{
return
AVERROR
(
ENOMEM
);
}
else
avcodec_get_frame_defaults
(
ost
->
filtered_frame
);
...
...
@@ -1056,7 +1056,7 @@ static int decode_audio(InputStream *ist, AVPacket *pkt, int *got_output)
AVCodecContext
*
avctx
=
ist
->
st
->
codec
;
int
i
,
ret
,
err
=
0
,
resample_changed
;
if
(
!
ist
->
decoded_frame
&&
!
(
ist
->
decoded_frame
=
av
codec_alloc
_frame
()))
if
(
!
ist
->
decoded_frame
&&
!
(
ist
->
decoded_frame
=
av_frame
_alloc
()))
return
AVERROR
(
ENOMEM
);
if
(
!
ist
->
filter_frame
&&
!
(
ist
->
filter_frame
=
av_frame_alloc
()))
return
AVERROR
(
ENOMEM
);
...
...
avplay.c
View file @
5b9c3b45
...
...
@@ -1842,7 +1842,7 @@ static int audio_decode_frame(VideoState *is, double *pts_ptr)
int
resample_changed
,
audio_resample
;
if
(
!
is
->
frame
)
{
if
(
!
(
is
->
frame
=
av
codec_alloc
_frame
()))
if
(
!
(
is
->
frame
=
av_frame
_alloc
()))
return
AVERROR
(
ENOMEM
);
}
else
avcodec_get_frame_defaults
(
is
->
frame
);
...
...
libavcodec/alacenc.c
View file @
5b9c3b45
...
...
@@ -579,7 +579,7 @@ static av_cold int alac_encode_init(AVCodecContext *avctx)
goto
error
;
}
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
{
ret
=
AVERROR
(
ENOMEM
);
goto
error
;
...
...
libavcodec/api-example.c
View file @
5b9c3b45
...
...
@@ -155,7 +155,7 @@ static void audio_encode_example(const char *filename)
}
/* frame containing input raw audio */
frame
=
av
codec_alloc
_frame
();
frame
=
av_frame
_alloc
();
if
(
!
frame
)
{
fprintf
(
stderr
,
"could not allocate audio frame
\n
"
);
exit
(
1
);
...
...
@@ -268,7 +268,7 @@ static void audio_decode_example(const char *outfilename, const char *filename)
int
got_frame
=
0
;
if
(
!
decoded_frame
)
{
if
(
!
(
decoded_frame
=
av
codec_alloc
_frame
()))
{
if
(
!
(
decoded_frame
=
av_frame
_alloc
()))
{
fprintf
(
stderr
,
"out of memory
\n
"
);
exit
(
1
);
}
...
...
@@ -334,7 +334,7 @@ static void video_encode_example(const char *filename)
}
c
=
avcodec_alloc_context3
(
codec
);
picture
=
av
codec_alloc
_frame
();
picture
=
av_frame
_alloc
();
/* put sample parameters */
c
->
bit_rate
=
400000
;
...
...
@@ -479,7 +479,7 @@ static void video_decode_example(const char *outfilename, const char *filename)
}
c
=
avcodec_alloc_context3
(
codec
);
picture
=
av
codec_alloc
_frame
();
picture
=
av_frame
_alloc
();
if
(
codec
->
capabilities
&
CODEC_CAP_TRUNCATED
)
c
->
flags
|=
CODEC_FLAG_TRUNCATED
;
/* we do not send complete frames */
...
...
libavcodec/libopenjpegenc.c
View file @
5b9c3b45
...
...
@@ -168,7 +168,7 @@ static av_cold int libopenjpeg_encode_init(AVCodecContext *avctx)
return
AVERROR
(
ENOMEM
);
}
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error allocating coded frame
\n
"
);
goto
fail
;
...
...
libavcodec/libtheoraenc.c
View file @
5b9c3b45
...
...
@@ -259,7 +259,7 @@ static av_cold int encode_init(AVCodecContext* avc_context)
th_comment_clear
(
&
t_comment
);
/* Set up the output AVFrame */
avc_context
->
coded_frame
=
av
codec_alloc
_frame
();
avc_context
->
coded_frame
=
av_frame
_alloc
();
return
0
;
}
...
...
libavcodec/libvpxenc.c
View file @
5b9c3b45
...
...
@@ -353,7 +353,7 @@ static av_cold int vpx_init(AVCodecContext *avctx,
vpx_img_wrap
(
&
ctx
->
rawimg
,
VPX_IMG_FMT_I420
,
avctx
->
width
,
avctx
->
height
,
1
,
(
unsigned
char
*
)
1
);
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Error allocating coded frame
\n
"
);
vp8_free
(
avctx
);
...
...
libavcodec/pcm.c
View file @
5b9c3b45
...
...
@@ -48,7 +48,7 @@ static av_cold int pcm_encode_init(AVCodecContext *avctx)
avctx
->
bits_per_coded_sample
=
av_get_bits_per_sample
(
avctx
->
codec
->
id
);
avctx
->
block_align
=
avctx
->
channels
*
avctx
->
bits_per_coded_sample
/
8
;
avctx
->
bit_rate
=
avctx
->
block_align
*
avctx
->
sample_rate
*
8
;
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
return
AVERROR
(
ENOMEM
);
...
...
libavcodec/proresenc.c
View file @
5b9c3b45
...
...
@@ -1075,7 +1075,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
int
interlaced
=
!!
(
avctx
->
flags
&
CODEC_FLAG_INTERLACED_DCT
);
avctx
->
bits_per_raw_sample
=
10
;
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
return
AVERROR
(
ENOMEM
);
...
...
libavcodec/svq1dec.c
View file @
5b9c3b45
...
...
@@ -742,7 +742,7 @@ static av_cold int svq1_decode_init(AVCodecContext *avctx)
int
i
;
int
offset
=
0
;
s
->
prev
=
av
codec_alloc
_frame
();
s
->
prev
=
av_frame
_alloc
();
if
(
!
s
->
prev
)
return
AVERROR
(
ENOMEM
);
...
...
libavcodec/utils.c
View file @
5b9c3b45
...
...
@@ -1125,7 +1125,7 @@ static int pad_last_frame(AVCodecContext *s, AVFrame **dst, const AVFrame *src)
AVFrame
*
frame
=
NULL
;
int
ret
;
if
(
!
(
frame
=
av
codec_alloc
_frame
()))
if
(
!
(
frame
=
av_frame
_alloc
()))
return
AVERROR
(
ENOMEM
);
frame
->
format
=
src
->
format
;
...
...
libavcodec/utvideoenc.c
View file @
5b9c3b45
...
...
@@ -126,7 +126,7 @@ static av_cold int utvideo_encode_init(AVCodecContext *avctx)
return
AVERROR_OPTION_NOT_FOUND
;
}
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Could not allocate frame.
\n
"
);
...
...
libavcodec/v210enc.c
View file @
5b9c3b45
...
...
@@ -36,7 +36,7 @@ static av_cold int encode_init(AVCodecContext *avctx)
av_log
(
avctx
,
AV_LOG_WARNING
,
"bits per raw sample: %d != 10-bit
\n
"
,
avctx
->
bits_per_raw_sample
);
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
return
AVERROR
(
ENOMEM
);
...
...
libavcodec/v410enc.c
View file @
5b9c3b45
...
...
@@ -32,7 +32,7 @@ static av_cold int v410_encode_init(AVCodecContext *avctx)
return
AVERROR_INVALIDDATA
;
}
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
{
av_log
(
avctx
,
AV_LOG_ERROR
,
"Could not allocate frame.
\n
"
);
...
...
libavcodec/xbmenc.c
View file @
5b9c3b45
...
...
@@ -26,7 +26,7 @@
static
av_cold
int
xbm_encode_init
(
AVCodecContext
*
avctx
)
{
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
return
AVERROR
(
ENOMEM
);
avctx
->
coded_frame
->
pict_type
=
AV_PICTURE_TYPE_I
;
...
...
libavcodec/xwdenc.c
View file @
5b9c3b45
...
...
@@ -32,7 +32,7 @@
static
av_cold
int
xwd_encode_init
(
AVCodecContext
*
avctx
)
{
avctx
->
coded_frame
=
av
codec_alloc
_frame
();
avctx
->
coded_frame
=
av_frame
_alloc
();
if
(
!
avctx
->
coded_frame
)
return
AVERROR
(
ENOMEM
);
...
...
libavformat/output-example.c
View file @
5b9c3b45
...
...
@@ -138,7 +138,7 @@ static void write_audio_frame(AVFormatContext *oc, AVStream *st)
{
AVCodecContext
*
c
;
AVPacket
pkt
=
{
0
};
// data and size must be 0;
AVFrame
*
frame
=
av
codec_alloc
_frame
();
AVFrame
*
frame
=
av_frame
_alloc
();
int
got_packet
;
av_init_packet
(
&
pkt
);
...
...
@@ -237,7 +237,7 @@ static AVFrame *alloc_picture(enum AVPixelFormat pix_fmt, int width, int height)
uint8_t
*
picture_buf
;
int
size
;
picture
=
av
codec_alloc
_frame
();
picture
=
av_frame
_alloc
();
if
(
!
picture
)
return
NULL
;
size
=
avpicture_get_size
(
pix_fmt
,
width
,
height
);
...
...
libavformat/utils.c
View file @
5b9c3b45
...
...
@@ -1928,7 +1928,7 @@ static int try_decode_frame(AVStream *st, AVPacket *avpkt, AVDictionary **option
{
const
AVCodec
*
codec
;
int
got_picture
=
1
,
ret
=
0
;
AVFrame
*
frame
=
av
codec_alloc
_frame
();
AVFrame
*
frame
=
av_frame
_alloc
();
AVPacket
pkt
=
*
avpkt
;
if
(
!
frame
)
...
...
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