Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
audiowmark
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
audiowmark
Commits
7af3418c
Commit
7af3418c
authored
Aug 28, 2022
by
Stefan Westerfeld
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix building HLS support with newer ffmpeg versions.
Signed-off-by:
Stefan Westerfeld
<
stefan@space.twc.de
>
parent
abe39588
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
hlsoutputstream.cc
src/hlsoutputstream.cc
+3
-3
hlsoutputstream.hh
src/hlsoutputstream.hh
+3
-2
No files found.
src/hlsoutputstream.cc
View file @
7af3418c
...
...
@@ -76,7 +76,7 @@ HLSOutputStream::~HLSOutputStream()
/* Add an output stream. */
Error
HLSOutputStream
::
add_stream
(
AVCodec
**
codec
,
enum
AVCodecID
codec_id
)
HLSOutputStream
::
add_stream
(
const
AVCodec
**
codec
,
enum
AVCodecID
codec_id
)
{
/* find the encoder */
*
codec
=
avcodec_find_encoder
(
codec_id
);
...
...
@@ -170,7 +170,7 @@ HLSOutputStream::alloc_audio_frame (AVSampleFormat sample_fmt, uint64_t channel_
Error
HLSOutputStream
::
open_audio
(
AVCodec
*
codec
,
AVDictionary
*
opt_arg
)
HLSOutputStream
::
open_audio
(
const
AVCodec
*
codec
,
AVDictionary
*
opt_arg
)
{
int
nb_samples
;
int
ret
;
...
...
@@ -385,7 +385,7 @@ HLSOutputStream::open (const string& out_filename, size_t cut_aac_frames, size_t
return
Error
(
av_err2str
(
ret
));
AVDictionary
*
opt
=
nullptr
;
AVCodec
*
audio_codec
;
const
AVCodec
*
audio_codec
;
Error
err
=
add_stream
(
&
audio_codec
,
AV_CODEC_ID_AAC
);
if
(
err
)
return
err
;
...
...
src/hlsoutputstream.hh
View file @
7af3418c
...
...
@@ -29,6 +29,7 @@ extern "C" {
#include <libswresample/swresample.h>
#include <libavutil/avassert.h>
#include <libavutil/timestamp.h>
#include <libavcodec/avcodec.h>
}
class
HLSOutputStream
:
public
AudioOutputStream
{
...
...
@@ -64,8 +65,8 @@ class HLSOutputStream : public AudioOutputStream {
};
State
m_state
=
State
::
NEW
;
Error
add_stream
(
AVCodec
**
codec
,
enum
AVCodecID
codec_id
);
Error
open_audio
(
AVCodec
*
codec
,
AVDictionary
*
opt_arg
);
Error
add_stream
(
const
AVCodec
**
codec
,
enum
AVCodecID
codec_id
);
Error
open_audio
(
const
AVCodec
*
codec
,
AVDictionary
*
opt_arg
);
AVFrame
*
get_audio_frame
();
enum
class
EncResult
{
OK
,
...
...
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