Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
F
FFmpeg
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
libremedia
Tethys
FFmpeg
Commits
87f87ccf
Commit
87f87ccf
authored
9 years ago
by
Diego Biurrun
Browse files
Options
Downloads
Patches
Plain Diff
mjpeg: Use a more precise type for put_marker()
parent
e6e3dcba
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
libavcodec/mjpeg.h
+2
-2
2 additions, 2 deletions
libavcodec/mjpeg.h
libavcodec/mjpegenc.h
+2
-1
2 additions, 1 deletion
libavcodec/mjpegenc.h
with
4 additions
and
3 deletions
libavcodec/mjpeg.h
+
2
−
2
View file @
87f87ccf
...
@@ -38,7 +38,7 @@
...
@@ -38,7 +38,7 @@
#include
"avcodec.h"
#include
"avcodec.h"
/* JPEG marker codes */
/* JPEG marker codes */
typedef
enum
{
enum
JpegMarker
{
/* start of frame */
/* start of frame */
SOF0
=
0xc0
,
/* baseline */
SOF0
=
0xc0
,
/* baseline */
SOF1
=
0xc1
,
/* extended sequential, huffman */
SOF1
=
0xc1
,
/* extended sequential, huffman */
...
@@ -117,7 +117,7 @@ typedef enum {
...
@@ -117,7 +117,7 @@ typedef enum {
TEM
=
0x01
,
/* temporary private use for arithmetic coding */
TEM
=
0x01
,
/* temporary private use for arithmetic coding */
/* 0x02 -> 0xbf reserved */
/* 0x02 -> 0xbf reserved */
}
JPEG_MARKER
;
};
#define PREDICT(ret, topleft, top, left, predictor)\
#define PREDICT(ret, topleft, top, left, predictor)\
switch(predictor){\
switch(predictor){\
...
...
This diff is collapsed.
Click to expand it.
libavcodec/mjpegenc.h
+
2
−
1
View file @
87f87ccf
...
@@ -35,6 +35,7 @@
...
@@ -35,6 +35,7 @@
#include
<stdint.h>
#include
<stdint.h>
#include
"mjpeg.h"
#include
"mpegvideo.h"
#include
"mpegvideo.h"
#include
"put_bits.h"
#include
"put_bits.h"
...
@@ -50,7 +51,7 @@ typedef struct MJpegContext {
...
@@ -50,7 +51,7 @@ typedef struct MJpegContext {
uint16_t
huff_code_ac_chrominance
[
256
];
uint16_t
huff_code_ac_chrominance
[
256
];
}
MJpegContext
;
}
MJpegContext
;
static
inline
void
put_marker
(
PutBitContext
*
p
,
int
code
)
static
inline
void
put_marker
(
PutBitContext
*
p
,
enum
JpegMarker
code
)
{
{
put_bits
(
p
,
8
,
0xff
);
put_bits
(
p
,
8
,
0xff
);
put_bits
(
p
,
8
,
code
);
put_bits
(
p
,
8
,
code
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment