Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-gpu
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-gpu
Commits
3a1de541
Commit
3a1de541
authored
Dec 05, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Contribs: possibly fix encoding in audio
Should close #7804 #7692 #7748
parent
e8841760
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
0 deletions
+29
-0
contrib/src/ffmpeg/libavcodec-a25d912.patch
contrib/src/ffmpeg/libavcodec-a25d912.patch
+28
-0
contrib/src/ffmpeg/rules.mak
contrib/src/ffmpeg/rules.mak
+1
-0
No files found.
contrib/src/ffmpeg/libavcodec-a25d912.patch
0 → 100644
View file @
3a1de541
From: =?utf8?q?Rafa=C3=ABl=20Carr=C3=A9?= <funman@videolan.org>
Date: Mon, 15 Oct 2012 18:41:55 +0200
Subject: [PATCH] avcodec_encode_audio(): fix invalid free
Since 2bc0de385, AVFrame needs to be initialized
before calling avcodec_get_frame_defaults().
Signed-off-by: Anton Khirnov <anton@khirnov.net>
---
libavcodec/utils.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index bb99a5a..836d953 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1073,7 +1073,7 @@
int attribute_align_arg avcodec_encode_audio(AVCodecContext *avctx,
const short *samples)
{
AVPacket pkt;
- AVFrame frame0;
+ AVFrame frame0 = { 0 };
AVFrame *frame;
int ret, samples_size, got_packet;
--
1.7.2.5
contrib/src/ffmpeg/rules.mak
View file @
3a1de541
...
@@ -126,6 +126,7 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
...
@@ -126,6 +126,7 @@ ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz .sum-ffmpeg
ifdef
HAVE_WIN32
ifdef
HAVE_WIN32
sed
-i
"s/std=c99/std=gnu99/"
$@
-
$(FFMPEG_VERSION)
/configure
sed
-i
"s/std=c99/std=gnu99/"
$@
-
$(FFMPEG_VERSION)
/configure
endif
endif
$(APPLY)
$(SRC)
/ffmpeg/libav.git-a25d912.patch
$(MOVE)
$(MOVE)
.ffmpeg
:
ffmpeg
.ffmpeg
:
ffmpeg
...
...
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