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
12cc3bf2
Commit
12cc3bf2
authored
11 years ago
by
Michael Niedermayer
Browse files
Options
Downloads
Patches
Plain Diff
avformat: rename a few more h.265 to HEVC
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
59352a07
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
libavformat/Makefile
+1
-1
1 addition, 1 deletion
libavformat/Makefile
libavformat/allformats.c
+1
-1
1 addition, 1 deletion
libavformat/allformats.c
libavformat/hevcdec.c
+2
-2
2 additions, 2 deletions
libavformat/hevcdec.c
with
4 additions
and
4 deletions
libavformat/Makefile
+
1
−
1
View file @
12cc3bf2
...
@@ -166,7 +166,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o
...
@@ -166,7 +166,7 @@ OBJS-$(CONFIG_H263_DEMUXER) += h263dec.o rawdec.o
OBJS-$(CONFIG_H263_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_H263_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_H264_DEMUXER)
+=
h264dec.o rawdec.o
OBJS-$(CONFIG_H264_DEMUXER)
+=
h264dec.o rawdec.o
OBJS-$(CONFIG_H264_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_H264_MUXER)
+=
rawenc.o
OBJS-$(CONFIG_H
265
_DEMUXER)
+=
h
265
dec.o rawdec.o
OBJS-$(CONFIG_H
EVC
_DEMUXER)
+=
h
evc
dec.o rawdec.o
OBJS-$(CONFIG_HLS_DEMUXER)
+=
hls.o
OBJS-$(CONFIG_HLS_DEMUXER)
+=
hls.o
OBJS-$(CONFIG_HLS_MUXER)
+=
hlsenc.o
OBJS-$(CONFIG_HLS_MUXER)
+=
hlsenc.o
OBJS-$(CONFIG_ICO_DEMUXER)
+=
icodec.o
OBJS-$(CONFIG_ICO_DEMUXER)
+=
icodec.o
...
...
This diff is collapsed.
Click to expand it.
libavformat/allformats.c
+
1
−
1
View file @
12cc3bf2
...
@@ -135,7 +135,7 @@ void av_register_all(void)
...
@@ -135,7 +135,7 @@ void av_register_all(void)
REGISTER_MUXDEMUX
(
H261
,
h261
);
REGISTER_MUXDEMUX
(
H261
,
h261
);
REGISTER_MUXDEMUX
(
H263
,
h263
);
REGISTER_MUXDEMUX
(
H263
,
h263
);
REGISTER_MUXDEMUX
(
H264
,
h264
);
REGISTER_MUXDEMUX
(
H264
,
h264
);
REGISTER_DEMUXER
(
H
265
,
h
265
);
REGISTER_DEMUXER
(
H
EVC
,
h
evc
);
REGISTER_MUXDEMUX
(
HLS
,
hls
);
REGISTER_MUXDEMUX
(
HLS
,
hls
);
REGISTER_MUXDEMUX
(
ICO
,
ico
);
REGISTER_MUXDEMUX
(
ICO
,
ico
);
REGISTER_DEMUXER
(
IDCIN
,
idcin
);
REGISTER_DEMUXER
(
IDCIN
,
idcin
);
...
...
This diff is collapsed.
Click to expand it.
libavformat/h
265
dec.c
→
libavformat/h
evc
dec.c
+
2
−
2
View file @
12cc3bf2
...
@@ -22,7 +22,7 @@
...
@@ -22,7 +22,7 @@
#include
"avformat.h"
#include
"avformat.h"
#include
"rawdec.h"
#include
"rawdec.h"
static
int
h
265
_probe
(
AVProbeData
*
p
)
static
int
h
evc
_probe
(
AVProbeData
*
p
)
{
{
uint32_t
code
=
-
1
;
uint32_t
code
=
-
1
;
int
vps
=
0
,
sps
=
0
,
pps
=
0
,
idr
=
0
;
int
vps
=
0
,
sps
=
0
,
pps
=
0
,
idr
=
0
;
...
@@ -57,4 +57,4 @@ static int h265_probe(AVProbeData *p)
...
@@ -57,4 +57,4 @@ static int h265_probe(AVProbeData *p)
return
0
;
return
0
;
}
}
FF_DEF_RAWVIDEO_DEMUXER
(
h
265
,
"raw H
.265
video"
,
h
265
_probe
,
"h265,265,hevc"
,
AV_CODEC_ID_HEVC
)
FF_DEF_RAWVIDEO_DEMUXER
(
h
evc
,
"raw H
EVC
video"
,
h
evc
_probe
,
"h265,265,hevc"
,
AV_CODEC_ID_HEVC
)
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