diff options
| author | Jean First <jeanfirst@gmail.com> | 2012-04-28 15:38:41 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-28 19:07:30 +0200 |
| commit | 64943b47e788fbb95d93ce8efe94d0919f3d7211 (patch) | |
| tree | 66115269e097627ab2e80146315cebef21776bf4 /libavformat | |
| parent | 75d5624cb25764c7f690cf4d13f6bcd94d4876a3 (diff) | |
| download | ffmpeg-64943b47e788fbb95d93ce8efe94d0919f3d7211.tar.gz | |
lavf remove duplicated check in has_duration
this hunk was merged in 8b97ae64 and cbf767a8 although the check was there a
few lines above since cdced09e. I removed the first check to reduce the differences
to libav.
Signed-off-by: Jean First <jeanfirst@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index e33d9a49ff..d6e7f69ec5 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -1977,8 +1977,6 @@ static int has_duration(AVFormatContext *ic) { int i; AVStream *st; - if(ic->duration != AV_NOPTS_VALUE) - return 1; for(i = 0;i < ic->nb_streams; i++) { st = ic->streams[i]; |