projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
14eb334
)
remove useless if()
author
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Mar 2007 02:23:53 +0000
(
02:23
+0000)
committer
Michael Niedermayer
<michaelni@gmx.at>
Sat, 17 Mar 2007 02:23:53 +0000
(
02:23
+0000)
Originally committed as revision 8428 to svn://svn.ffmpeg.org/ffmpeg/trunk
libavformat/utils.c
patch
|
blob
|
history
diff --git
a/libavformat/utils.c
b/libavformat/utils.c
index
3c175a6
..
2696771
100644
(file)
--- a/
libavformat/utils.c
+++ b/
libavformat/utils.c
@@
-632,7
+632,7
@@
static void compute_pkt_fields(AVFormatContext *s, AVStream *st,
st->last_IP_pts= pkt->pts;
/* cannot compute PTS if not present (we can compute it only
by knowing the futur */
- } else
if(pkt->pts != AV_NOPTS_VALUE || pkt->dts != AV_NOPTS_VALUE || pkt->duration)
{
+ } else {
if(pkt->pts != AV_NOPTS_VALUE && pkt->duration){
int64_t old_diff= FFABS(st->cur_dts - pkt->duration - pkt->pts);
int64_t new_diff= FFABS(st->cur_dts - pkt->pts);