Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
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
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
9f99a5f1
Commit
9f99a5f1
authored
Jul 20, 2014
by
Nidhi Makhijani
Committed by
Diego Biurrun
Jul 20, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
mpegencconetxt: Move rv10-specific orig_width/orig_height where they belong
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
1a583c0c
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
mpegvideo.h
libavcodec/mpegvideo.h
+0
-1
rv10.c
libavcodec/rv10.c
+7
-6
No files found.
libavcodec/mpegvideo.h
View file @
9f99a5f1
...
@@ -542,7 +542,6 @@ typedef struct MpegEncContext {
...
@@ -542,7 +542,6 @@ typedef struct MpegEncContext {
/* RV10 specific */
/* RV10 specific */
int
rv10_version
;
///< RV10 version: 0 or 3
int
rv10_version
;
///< RV10 version: 0 or 3
int
rv10_first_dc_coded
[
3
];
int
rv10_first_dc_coded
[
3
];
int
orig_width
,
orig_height
;
/* MJPEG specific */
/* MJPEG specific */
struct
MJpegContext
*
mjpeg_ctx
;
struct
MJpegContext
*
mjpeg_ctx
;
...
...
libavcodec/rv10.c
View file @
9f99a5f1
...
@@ -46,6 +46,7 @@
...
@@ -46,6 +46,7 @@
typedef
struct
RVDecContext
{
typedef
struct
RVDecContext
{
MpegEncContext
m
;
MpegEncContext
m
;
int
sub_id
;
int
sub_id
;
int
orig_width
,
orig_height
;
}
RVDecContext
;
}
RVDecContext
;
static
const
uint16_t
rv_lum_code
[
256
]
=
{
static
const
uint16_t
rv_lum_code
[
256
]
=
{
...
@@ -365,8 +366,8 @@ static int rv20_decode_picture_header(RVDecContext *rv)
...
@@ -365,8 +366,8 @@ static int rv20_decode_picture_header(RVDecContext *rv)
new_w
=
4
*
((
uint8_t
*
)
s
->
avctx
->
extradata
)[
6
+
2
*
f
];
new_w
=
4
*
((
uint8_t
*
)
s
->
avctx
->
extradata
)[
6
+
2
*
f
];
new_h
=
4
*
((
uint8_t
*
)
s
->
avctx
->
extradata
)[
7
+
2
*
f
];
new_h
=
4
*
((
uint8_t
*
)
s
->
avctx
->
extradata
)[
7
+
2
*
f
];
}
else
{
}
else
{
new_w
=
s
->
orig_width
;
new_w
=
rv
->
orig_width
;
new_h
=
s
->
orig_height
;
new_h
=
rv
->
orig_height
;
}
}
if
(
new_w
!=
s
->
width
||
new_h
!=
s
->
height
)
{
if
(
new_w
!=
s
->
width
||
new_h
!=
s
->
height
)
{
av_log
(
s
->
avctx
,
AV_LOG_DEBUG
,
av_log
(
s
->
avctx
,
AV_LOG_DEBUG
,
...
@@ -460,9 +461,9 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
...
@@ -460,9 +461,9 @@ static av_cold int rv10_decode_init(AVCodecContext *avctx)
s
->
out_format
=
FMT_H263
;
s
->
out_format
=
FMT_H263
;
s
->
codec_id
=
avctx
->
codec_id
;
s
->
codec_id
=
avctx
->
codec_id
;
s
->
orig_width
=
rv
->
orig_width
=
s
->
width
=
avctx
->
coded_width
;
s
->
width
=
avctx
->
coded_width
;
s
->
orig_height
=
rv
->
orig_height
=
s
->
height
=
avctx
->
coded_height
;
s
->
height
=
avctx
->
coded_height
;
s
->
h263_long_vectors
=
((
uint8_t
*
)
avctx
->
extradata
)[
3
]
&
1
;
s
->
h263_long_vectors
=
((
uint8_t
*
)
avctx
->
extradata
)[
3
]
&
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