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
bdbf1fa4
Commit
bdbf1fa4
authored
Jan 13, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asfdec: Do not set AVCodecContext.frame_size
parent
4bf6775e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
20 deletions
+0
-20
asfdec.c
libavformat/asfdec.c
+0
-20
No files found.
libavformat/asfdec.c
View file @
bdbf1fa4
...
...
@@ -26,7 +26,6 @@
#include "libavutil/avstring.h"
#include "libavutil/dict.h"
#include "libavutil/mathematics.h"
#include "libavcodec/mpegaudio.h"
#include "avformat.h"
#include "internal.h"
#include "avio_internal.h"
...
...
@@ -323,25 +322,6 @@ static int asf_read_stream_properties(AVFormatContext *s, int64_t size)
||
asf_st
->
ds_packet_size
%
asf_st
->
ds_chunk_size
)
asf_st
->
ds_span
=
0
;
// disable descrambling
}
switch
(
st
->
codec
->
codec_id
)
{
case
CODEC_ID_MP3
:
st
->
codec
->
frame_size
=
MPA_FRAME_SIZE
;
break
;
case
CODEC_ID_PCM_S16LE
:
case
CODEC_ID_PCM_S16BE
:
case
CODEC_ID_PCM_U16LE
:
case
CODEC_ID_PCM_U16BE
:
case
CODEC_ID_PCM_S8
:
case
CODEC_ID_PCM_U8
:
case
CODEC_ID_PCM_ALAW
:
case
CODEC_ID_PCM_MULAW
:
st
->
codec
->
frame_size
=
1
;
break
;
default
:
/* This is probably wrong, but it prevents a crash later */
st
->
codec
->
frame_size
=
1
;
break
;
}
}
else
if
(
type
==
AVMEDIA_TYPE_VIDEO
&&
size
-
(
avio_tell
(
pb
)
-
pos1
+
24
)
>=
51
)
{
avio_rl32
(
pb
);
...
...
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