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
8f63f241
Commit
8f63f241
authored
May 01, 2012
by
Reimar Döffinger
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove some useless code that duplicates av_get_packet.
Signed-off-by:
Reimar Döffinger
<
Reimar.Doeffinger@gmx.de
>
parent
7effbee6
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
6 additions
and
33 deletions
+6
-33
au.c
libavformat/au.c
+0
-4
flvdec.c
libavformat/flvdec.c
+0
-3
gsmdec.c
libavformat/gsmdec.c
+0
-1
ingenientdec.c
libavformat/ingenientdec.c
+3
-10
mmf.c
libavformat/mmf.c
+3
-7
rsodec.c
libavformat/rsodec.c
+0
-3
sol.c
libavformat/sol.c
+0
-4
soxdec.c
libavformat/soxdec.c
+0
-1
No files found.
libavformat/au.c
View file @
8f63f241
...
@@ -189,10 +189,6 @@ static int au_read_packet(AVFormatContext *s,
...
@@ -189,10 +189,6 @@ static int au_read_packet(AVFormatContext *s,
return
ret
;
return
ret
;
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
stream_index
=
0
;
pkt
->
stream_index
=
0
;
/* note: we need to modify the packet size here to handle the last
packet */
pkt
->
size
=
ret
;
return
0
;
return
0
;
}
}
...
...
libavformat/flvdec.c
View file @
8f63f241
...
@@ -656,9 +656,6 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -656,9 +656,6 @@ static int flv_read_packet(AVFormatContext *s, AVPacket *pkt)
if
(
ret
<
0
)
{
if
(
ret
<
0
)
{
return
AVERROR
(
EIO
);
return
AVERROR
(
EIO
);
}
}
/* note: we need to modify the packet size here to handle the last
packet */
pkt
->
size
=
ret
;
pkt
->
dts
=
dts
;
pkt
->
dts
=
dts
;
pkt
->
pts
=
pts
==
AV_NOPTS_VALUE
?
dts
:
pts
;
pkt
->
pts
=
pts
==
AV_NOPTS_VALUE
?
dts
:
pts
;
pkt
->
stream_index
=
st
->
index
;
pkt
->
stream_index
=
st
->
index
;
...
...
libavformat/gsmdec.c
View file @
8f63f241
...
@@ -47,7 +47,6 @@ static int gsm_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -47,7 +47,6 @@ static int gsm_read_packet(AVFormatContext *s, AVPacket *pkt)
av_free_packet
(
pkt
);
av_free_packet
(
pkt
);
return
ret
<
0
?
ret
:
AVERROR
(
EIO
);
return
ret
<
0
?
ret
:
AVERROR
(
EIO
);
}
}
pkt
->
size
=
ret
;
pkt
->
duration
=
1
;
pkt
->
duration
=
1
;
pkt
->
pts
=
pkt
->
pos
/
GSM_BLOCK_SIZE
;
pkt
->
pts
=
pkt
->
pos
/
GSM_BLOCK_SIZE
;
...
...
libavformat/ingenientdec.c
View file @
8f63f241
...
@@ -44,17 +44,10 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -44,17 +44,10 @@ static int ingenient_read_packet(AVFormatContext *s, AVPacket *pkt)
av_log
(
s
,
AV_LOG_DEBUG
,
"Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d
\n
"
,
av_log
(
s
,
AV_LOG_DEBUG
,
"Ingenient packet: size=%d, width=%d, height=%d, unk1=%d unk2=%d
\n
"
,
size
,
w
,
h
,
unk1
,
unk2
);
size
,
w
,
h
,
unk1
,
unk2
);
if
(
av_new_packet
(
pkt
,
size
)
<
0
)
ret
=
av_get_packet
(
s
->
pb
,
pkt
,
size
);
return
AVERROR
(
ENOMEM
);
if
(
ret
<
0
)
pkt
->
pos
=
avio_tell
(
s
->
pb
);
pkt
->
stream_index
=
0
;
ret
=
avio_read
(
s
->
pb
,
pkt
->
data
,
size
);
if
(
ret
<
0
)
{
av_free_packet
(
pkt
);
return
ret
;
return
ret
;
}
pkt
->
stream_index
=
0
;
pkt
->
size
=
ret
;
return
ret
;
return
ret
;
}
}
...
...
libavformat/mmf.c
View file @
8f63f241
...
@@ -275,17 +275,13 @@ static int mmf_read_packet(AVFormatContext *s,
...
@@ -275,17 +275,13 @@ static int mmf_read_packet(AVFormatContext *s,
if
(
!
size
)
if
(
!
size
)
return
AVERROR
(
EIO
);
return
AVERROR
(
EIO
);
if
(
av_new_packet
(
pkt
,
size
))
ret
=
av_get_packet
(
s
->
pb
,
pkt
,
size
);
return
AVERROR
(
EIO
);
pkt
->
stream_index
=
0
;
ret
=
avio_read
(
s
->
pb
,
pkt
->
data
,
pkt
->
size
);
if
(
ret
<
0
)
if
(
ret
<
0
)
av_free_packet
(
pkt
)
;
return
ret
;
pkt
->
stream_index
=
0
;
mmf
->
data_size
-=
ret
;
mmf
->
data_size
-=
ret
;
pkt
->
size
=
ret
;
return
ret
;
return
ret
;
}
}
...
...
libavformat/rsodec.c
View file @
8f63f241
...
@@ -83,9 +83,6 @@ static int rso_read_packet(AVFormatContext *s, AVPacket *pkt)
...
@@ -83,9 +83,6 @@ static int rso_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
stream_index
=
0
;
pkt
->
stream_index
=
0
;
/* note: we need to modify the packet size here to handle the last packet */
pkt
->
size
=
ret
;
return
0
;
return
0
;
}
}
...
...
libavformat/sol.c
View file @
8f63f241
...
@@ -135,10 +135,6 @@ static int sol_read_packet(AVFormatContext *s,
...
@@ -135,10 +135,6 @@ static int sol_read_packet(AVFormatContext *s,
return
ret
;
return
ret
;
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
stream_index
=
0
;
pkt
->
stream_index
=
0
;
/* note: we need to modify the packet size here to handle the last
packet */
pkt
->
size
=
ret
;
return
0
;
return
0
;
}
}
...
...
libavformat/soxdec.c
View file @
8f63f241
...
@@ -140,7 +140,6 @@ static int sox_read_packet(AVFormatContext *s,
...
@@ -140,7 +140,6 @@ static int sox_read_packet(AVFormatContext *s,
return
AVERROR
(
EIO
);
return
AVERROR
(
EIO
);
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
flags
&=
~
AV_PKT_FLAG_CORRUPT
;
pkt
->
stream_index
=
0
;
pkt
->
stream_index
=
0
;
pkt
->
size
=
ret
;
return
0
;
return
0
;
}
}
...
...
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