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
8a3f9764
Commit
8a3f9764
authored
Nov 08, 2011
by
Carl Eugen Hoyos
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Support decoding "m1v " mpeg1video in mov.
Fixes ticket #579 at least for ffplay.
parent
6aaf6db2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
isom.c
libavformat/isom.c
+1
-0
mov.c
libavformat/mov.c
+3
-0
No files found.
libavformat/isom.c
View file @
8a3f9764
...
...
@@ -154,6 +154,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{
CODEC_ID_MPEG1VIDEO
,
MKTAG
(
'm'
,
'1'
,
'v'
,
'1'
)
},
/* Apple MPEG-1 Camcorder */
{
CODEC_ID_MPEG1VIDEO
,
MKTAG
(
'm'
,
'p'
,
'e'
,
'g'
)
},
/* MPEG */
{
CODEC_ID_MPEG1VIDEO
,
MKTAG
(
'm'
,
'1'
,
'v'
,
' '
)
},
{
CODEC_ID_MPEG2VIDEO
,
MKTAG
(
'm'
,
'2'
,
'v'
,
'1'
)
},
/* Apple MPEG-2 Camcorder */
{
CODEC_ID_MPEG2VIDEO
,
MKTAG
(
'h'
,
'd'
,
'v'
,
'1'
)
},
/* MPEG2 HDV 720p30 */
{
CODEC_ID_MPEG2VIDEO
,
MKTAG
(
'h'
,
'd'
,
'v'
,
'2'
)
},
/* MPEG2 HDV 1080i60 */
...
...
libavformat/mov.c
View file @
8a3f9764
...
...
@@ -1378,6 +1378,9 @@ int ff_mov_read_stsd_entries(MOVContext *c, AVIOContext *pb, int entries)
case
CODEC_ID_AC3
:
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
break
;
case
CODEC_ID_MPEG1VIDEO
:
st
->
need_parsing
=
AVSTREAM_PARSE_FULL
;
break
;
default:
break
;
}
...
...
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