Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc-2-2
Commits
7a68780f
Commit
7a68780f
authored
Jul 21, 2013
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avcodec: fix av_pix_fmt_desc_get() with ffmpeg
parent
15ccbe93
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
modules/codec/avcodec/avcommon_compat.h
modules/codec/avcodec/avcommon_compat.h
+4
-0
modules/codec/avcodec/video.c
modules/codec/avcodec/video.c
+0
-4
No files found.
modules/codec/avcodec/avcommon_compat.h
View file @
7a68780f
...
...
@@ -499,6 +499,10 @@ enum {
# define AV_PIX_FMT_FLAG_HWACCEL PIX_FMT_HWACCEL
#endif
#if !LIBAVUTIL_VERSION_CHECK( 51, 44, 0, 76, 100 )
# define av_pix_fmt_desc_get(a) &av_pix_fmt_descriptors[a]
#endif
#endif
/* HAVE_LIBAVUTIL_AVUTIL_H */
#endif
modules/codec/avcodec/video.c
View file @
7a68780f
...
...
@@ -1075,13 +1075,9 @@ static enum PixelFormat ffmpeg_GetFormat( AVCodecContext *p_context,
bool
can_hwaccel
=
false
;
for
(
size_t
i
=
0
;
pi_fmt
[
i
]
!=
PIX_FMT_NONE
;
i
++
)
{
#if LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(51, 44, 0)
const
AVPixFmtDescriptor
*
dsc
=
av_pix_fmt_desc_get
(
pi_fmt
[
i
]);
if
(
dsc
==
NULL
)
continue
;
#else
const
AVPixFmtDescriptor
*
dsc
=
&
av_pix_fmt_descriptors
[
pi_fmt
[
i
]];
#endif
bool
hwaccel
=
(
dsc
->
flags
&
AV_PIX_FMT_FLAG_HWACCEL
)
!=
0
;
msg_Dbg
(
p_dec
,
"available %sware decoder output format %d (%s)"
,
...
...
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