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
7c23922c
Commit
7c23922c
authored
May 05, 2013
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Cosmetics: Reindent Sierra vmd demuxer after last commit.
parent
4ec509ce
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
24 additions
and
23 deletions
+24
-23
sierravmd.c
libavformat/sierravmd.c
+24
-23
No files found.
libavformat/sierravmd.c
View file @
7c23922c
...
...
@@ -106,28 +106,29 @@ static int vmd_read_header(AVFormatContext *s)
width
=
AV_RL16
(
&
vmd
->
vmd_header
[
12
]);
height
=
AV_RL16
(
&
vmd
->
vmd_header
[
14
]);
if
(
width
&&
height
)
{
if
(
vmd
->
vmd_header
[
24
]
==
'i'
&&
vmd
->
vmd_header
[
25
]
==
'v'
&&
vmd
->
vmd_header
[
26
]
==
'3'
)
vmd
->
is_indeo3
=
1
;
else
vmd
->
is_indeo3
=
0
;
/* start up the decoders */
vst
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
vst
)
return
AVERROR
(
ENOMEM
);
avpriv_set_pts_info
(
vst
,
33
,
1
,
10
);
vmd
->
video_stream_index
=
vst
->
index
;
vst
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
vst
->
codec
->
codec_id
=
vmd
->
is_indeo3
?
AV_CODEC_ID_INDEO3
:
AV_CODEC_ID_VMDVIDEO
;
vst
->
codec
->
codec_tag
=
0
;
/* no fourcc */
vst
->
codec
->
width
=
width
;
vst
->
codec
->
height
=
height
;
if
(
vmd
->
is_indeo3
&&
vst
->
codec
->
width
>
320
){
vst
->
codec
->
width
>>=
1
;
vst
->
codec
->
height
>>=
1
;
}
vst
->
codec
->
extradata_size
=
VMD_HEADER_SIZE
;
vst
->
codec
->
extradata
=
av_mallocz
(
VMD_HEADER_SIZE
+
FF_INPUT_BUFFER_PADDING_SIZE
);
memcpy
(
vst
->
codec
->
extradata
,
vmd
->
vmd_header
,
VMD_HEADER_SIZE
);
if
(
vmd
->
vmd_header
[
24
]
==
'i'
&&
vmd
->
vmd_header
[
25
]
==
'v'
&&
vmd
->
vmd_header
[
26
]
==
'3'
)
{
vmd
->
is_indeo3
=
1
;
}
else
{
vmd
->
is_indeo3
=
0
;
}
/* start up the decoders */
vst
=
avformat_new_stream
(
s
,
NULL
);
if
(
!
vst
)
return
AVERROR
(
ENOMEM
);
avpriv_set_pts_info
(
vst
,
33
,
1
,
10
);
vmd
->
video_stream_index
=
vst
->
index
;
vst
->
codec
->
codec_type
=
AVMEDIA_TYPE_VIDEO
;
vst
->
codec
->
codec_id
=
vmd
->
is_indeo3
?
AV_CODEC_ID_INDEO3
:
AV_CODEC_ID_VMDVIDEO
;
vst
->
codec
->
codec_tag
=
0
;
/* no fourcc */
vst
->
codec
->
width
=
width
;
vst
->
codec
->
height
=
height
;
if
(
vmd
->
is_indeo3
&&
vst
->
codec
->
width
>
320
){
vst
->
codec
->
width
>>=
1
;
vst
->
codec
->
height
>>=
1
;
}
vst
->
codec
->
extradata_size
=
VMD_HEADER_SIZE
;
vst
->
codec
->
extradata
=
av_mallocz
(
VMD_HEADER_SIZE
+
FF_INPUT_BUFFER_PADDING_SIZE
);
memcpy
(
vst
->
codec
->
extradata
,
vmd
->
vmd_header
,
VMD_HEADER_SIZE
);
}
/* if sample rate is 0, assume no audio */
...
...
@@ -163,7 +164,7 @@ static int vmd_read_header(AVFormatContext *s)
den
=
st
->
codec
->
sample_rate
*
st
->
codec
->
channels
;
av_reduce
(
&
num
,
&
den
,
num
,
den
,
(
1UL
<<
31
)
-
1
);
if
(
vst
)
avpriv_set_pts_info
(
vst
,
33
,
num
,
den
);
avpriv_set_pts_info
(
vst
,
33
,
num
,
den
);
avpriv_set_pts_info
(
st
,
33
,
num
,
den
);
}
...
...
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