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
868ac91c
Commit
868ac91c
authored
Jan 08, 2013
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
frmdec: do not abuse ff_codec_get_id()
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
db1ba221
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
frmdec.c
libavformat/frmdec.c
+3
-3
No files found.
libavformat/frmdec.c
View file @
868ac91c
...
@@ -24,11 +24,11 @@
...
@@ -24,11 +24,11 @@
* Megalux Frame demuxer
* Megalux Frame demuxer
*/
*/
#include "libavcodec/raw.h"
#include "libavutil/intreadwrite.h"
#include "libavutil/intreadwrite.h"
#include "avformat.h"
#include "avformat.h"
#include "riff.h"
static
const
AVCodec
Tag
frm_pix_fmt_tags
[]
=
{
static
const
PixelFormat
Tag
frm_pix_fmt_tags
[]
=
{
{
AV_PIX_FMT_RGB555
,
1
},
{
AV_PIX_FMT_RGB555
,
1
},
{
AV_PIX_FMT_RGB0
,
2
},
{
AV_PIX_FMT_RGB0
,
2
},
{
AV_PIX_FMT_RGB24
,
3
},
{
AV_PIX_FMT_RGB24
,
3
},
...
@@ -61,7 +61,7 @@ static int frm_read_header(AVFormatContext *avctx)
...
@@ -61,7 +61,7 @@ static int frm_read_header(AVFormatContext *avctx)
st
->
codec
->
codec_id
=
AV_CODEC_ID_RAWVIDEO
;
st
->
codec
->
codec_id
=
AV_CODEC_ID_RAWVIDEO
;
avio_skip
(
pb
,
3
);
avio_skip
(
pb
,
3
);
st
->
codec
->
pix_fmt
=
ff_codec_get_id
(
frm_pix_fmt_tags
,
avio_r8
(
pb
));
st
->
codec
->
pix_fmt
=
avpriv_find_pix_fmt
(
frm_pix_fmt_tags
,
avio_r8
(
pb
));
if
(
!
st
->
codec
->
pix_fmt
)
if
(
!
st
->
codec
->
pix_fmt
)
return
AVERROR_INVALIDDATA
;
return
AVERROR_INVALIDDATA
;
...
...
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