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
e2274aa5
Commit
e2274aa5
authored
Nov 09, 2013
by
Anton Khirnov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mjpegdec: use the AVFrame API properly.
parent
f0b234ab
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
4 deletions
+11
-4
mjpegdec.c
libavcodec/mjpegdec.c
+10
-3
mjpegdec.h
libavcodec/mjpegdec.h
+1
-1
No files found.
libavcodec/mjpegdec.c
View file @
e2274aa5
...
...
@@ -84,8 +84,12 @@ av_cold int ff_mjpeg_decode_init(AVCodecContext *avctx)
{
MJpegDecodeContext
*
s
=
avctx
->
priv_data
;
if
(
!
s
->
picture_ptr
)
s
->
picture_ptr
=
&
s
->
picture
;
if
(
!
s
->
picture_ptr
)
{
s
->
picture
=
av_frame_alloc
();
if
(
!
s
->
picture
)
return
AVERROR
(
ENOMEM
);
s
->
picture_ptr
=
s
->
picture
;
}
s
->
avctx
=
avctx
;
ff_hpeldsp_init
(
&
s
->
hdsp
,
avctx
->
flags
);
...
...
@@ -1651,7 +1655,10 @@ av_cold int ff_mjpeg_decode_end(AVCodecContext *avctx)
MJpegDecodeContext
*
s
=
avctx
->
priv_data
;
int
i
,
j
;
if
(
s
->
picture_ptr
)
if
(
s
->
picture
)
{
av_frame_free
(
&
s
->
picture
);
s
->
picture_ptr
=
NULL
;
}
else
if
(
s
->
picture_ptr
)
av_frame_unref
(
s
->
picture_ptr
);
av_free
(
s
->
buffer
);
...
...
libavcodec/mjpegdec.h
View file @
e2274aa5
...
...
@@ -84,7 +84,7 @@ typedef struct MJpegDecodeContext {
int
h_max
,
v_max
;
/* maximum h and v counts */
int
quant_index
[
4
];
/* quant table index for each component */
int
last_dc
[
MAX_COMPONENTS
];
/* last DEQUANTIZED dc (XXX: am I right to do that ?) */
AVFrame
picture
;
/* picture structure */
AVFrame
*
picture
;
/* picture structure */
AVFrame
*
picture_ptr
;
/* pointer to picture structure */
int
got_picture
;
///< we found a SOF and picture is valid, too.
int
linesize
[
MAX_COMPONENTS
];
///< linesize << interlaced
...
...
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