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
0ca1bdb3
Commit
0ca1bdb3
authored
Feb 15, 2012
by
Martin Storsjö
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
rtjpeg: Add ff_ prefix to nonstatic symbols
Signed-off-by:
Martin Storsjö
<
martin@martin.st
>
parent
6c28d657
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
12 deletions
+12
-12
nuv.c
libavcodec/nuv.c
+4
-4
rtjpeg.c
libavcodec/rtjpeg.c
+6
-6
rtjpeg.h
libavcodec/rtjpeg.h
+2
-2
No files found.
libavcodec/nuv.c
View file @
0ca1bdb3
...
...
@@ -121,9 +121,9 @@ static int codec_reinit(AVCodecContext *avctx, int width, int height, int qualit
av_log
(
avctx
,
AV_LOG_ERROR
,
"Can't allocate decompression buffer.
\n
"
);
return
0
;
}
rtjpeg_decode_init
(
&
c
->
rtj
,
&
c
->
dsp
,
c
->
width
,
c
->
height
,
c
->
lq
,
c
->
cq
);
ff_
rtjpeg_decode_init
(
&
c
->
rtj
,
&
c
->
dsp
,
c
->
width
,
c
->
height
,
c
->
lq
,
c
->
cq
);
}
else
if
(
quality
!=
c
->
quality
)
rtjpeg_decode_init
(
&
c
->
rtj
,
&
c
->
dsp
,
c
->
width
,
c
->
height
,
c
->
lq
,
c
->
cq
);
ff_
rtjpeg_decode_init
(
&
c
->
rtj
,
&
c
->
dsp
,
c
->
width
,
c
->
height
,
c
->
lq
,
c
->
cq
);
return
1
;
}
...
...
@@ -154,7 +154,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
ret
=
get_quant
(
avctx
,
c
,
buf
,
buf_size
);
if
(
ret
<
0
)
return
ret
;
rtjpeg_decode_init
(
&
c
->
rtj
,
&
c
->
dsp
,
c
->
width
,
c
->
height
,
c
->
lq
,
c
->
cq
);
ff_
rtjpeg_decode_init
(
&
c
->
rtj
,
&
c
->
dsp
,
c
->
width
,
c
->
height
,
c
->
lq
,
c
->
cq
);
return
orig_size
;
}
...
...
@@ -224,7 +224,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size,
}
case
NUV_RTJPEG_IN_LZO
:
case
NUV_RTJPEG
:
{
rtjpeg_decode_frame_yuv420
(
&
c
->
rtj
,
&
c
->
pic
,
buf
,
buf_size
);
ff_
rtjpeg_decode_frame_yuv420
(
&
c
->
rtj
,
&
c
->
pic
,
buf
,
buf_size
);
break
;
}
case
NUV_BLACK
:
{
...
...
libavcodec/rtjpeg.c
View file @
0ca1bdb3
...
...
@@ -97,15 +97,15 @@ static inline int get_block(GetBitContext *gb, DCTELEM *block, const uint8_t *sc
/**
* @brief decode one rtjpeg YUV420 frame
* @param c context, must be initialized via rtjpeg_decode_init
* @param c context, must be initialized via
ff_
rtjpeg_decode_init
* @param f AVFrame to place decoded frame into. If parts of the frame
* are not coded they are left unchanged, so consider initializing it
* @param buf buffer containing input data
* @param buf_size length of input data in bytes
* @return number of bytes consumed from the input buffer
*/
int
rtjpeg_decode_frame_yuv420
(
RTJpegContext
*
c
,
AVFrame
*
f
,
const
uint8_t
*
buf
,
int
buf_size
)
{
int
ff_
rtjpeg_decode_frame_yuv420
(
RTJpegContext
*
c
,
AVFrame
*
f
,
const
uint8_t
*
buf
,
int
buf_size
)
{
GetBitContext
gb
;
int
w
=
c
->
w
/
16
,
h
=
c
->
h
/
16
;
int
x
,
y
;
...
...
@@ -154,9 +154,9 @@ int rtjpeg_decode_frame_yuv420(RTJpegContext *c, AVFrame *f,
* @param lquant luma quantization table to use
* @param cquant chroma quantization table to use
*/
void
rtjpeg_decode_init
(
RTJpegContext
*
c
,
DSPContext
*
dsp
,
int
width
,
int
height
,
const
uint32_t
*
lquant
,
const
uint32_t
*
cquant
)
{
void
ff_
rtjpeg_decode_init
(
RTJpegContext
*
c
,
DSPContext
*
dsp
,
int
width
,
int
height
,
const
uint32_t
*
lquant
,
const
uint32_t
*
cquant
)
{
int
i
;
c
->
dsp
=
dsp
;
for
(
i
=
0
;
i
<
64
;
i
++
)
{
...
...
libavcodec/rtjpeg.h
View file @
0ca1bdb3
...
...
@@ -34,10 +34,10 @@ typedef struct {
DECLARE_ALIGNED
(
16
,
DCTELEM
,
block
)[
64
];
}
RTJpegContext
;
void
rtjpeg_decode_init
(
RTJpegContext
*
c
,
DSPContext
*
dsp
,
void
ff_
rtjpeg_decode_init
(
RTJpegContext
*
c
,
DSPContext
*
dsp
,
int
width
,
int
height
,
const
uint32_t
*
lquant
,
const
uint32_t
*
cquant
);
int
rtjpeg_decode_frame_yuv420
(
RTJpegContext
*
c
,
AVFrame
*
f
,
int
ff_
rtjpeg_decode_frame_yuv420
(
RTJpegContext
*
c
,
AVFrame
*
f
,
const
uint8_t
*
buf
,
int
buf_size
);
#endif
/* AVCODEC_RTJPEG_H */
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