| Message ID | 20180506141944.8838-1-jeebjp@gmail.com |
|---|---|
| State | Accepted |
| Commit | b995ec078f42bac95eda18fbd1b4387477b55d0d |
| Headers | show |
On Sun, 6 May 2018 17:19:44 +0300 Jan Ekström <jeebjp@gmail.com> wrote: > Yet another case of forgotten 0 =! EOF translation. The libbluray > documentation specifically mentions that a read of 0 is EOF. > > Reported by Fyr on IRC. > --- > libavformat/bluray.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/libavformat/bluray.c b/libavformat/bluray.c > index 9282bf9956..635c4f1b87 100644 > --- a/libavformat/bluray.c > +++ b/libavformat/bluray.c > @@ -198,7 +198,7 @@ static int bluray_read(URLContext *h, unsigned char *buf, int size) > > len = bd_read(bd->bd, buf, size); > > - return len; > + return len == 0 ? AVERROR_EOF : len; > } > > static int64_t bluray_seek(URLContext *h, int64_t pos, int whence) Hilarious, another of those EOf issues. Too bad we didn't just revert that crap. I wonder how many years it'll take until we got all of them. LGTM.
On Sun, May 6, 2018 at 5:32 PM, wm4 <nfxjfg@googlemail.com> wrote: > > Hilarious, another of those EOf issues. Too bad we didn't just revert > that crap. I wonder how many years it'll take until we got all of them. > > LGTM. Thanks, pushed. This should be back-ported to release/4.0 I guess? Jan
On Sun, May 06, 2018 at 06:55:01PM +0300, Jan Ekström wrote: > On Sun, May 6, 2018 at 5:32 PM, wm4 <nfxjfg@googlemail.com> wrote: > > > > Hilarious, another of those EOf issues. Too bad we didn't just revert > > that crap. I wonder how many years it'll take until we got all of them. > > > > LGTM. > > Thanks, pushed. This should be back-ported to release/4.0 I guess? probably yes thanks [...]
On Sun, May 6, 2018 at 11:16 PM, Michael Niedermayer <michael@niedermayer.cc> wrote: > On Sun, May 06, 2018 at 06:55:01PM +0300, Jan Ekström wrote: >> Thanks, pushed. This should be back-ported to release/4.0 I guess? > > probably yes > > thanks > Finally got the time, cherry-pick -x'd and pushed to release/4.0. Jan
diff --git a/libavformat/bluray.c b/libavformat/bluray.c index 9282bf9956..635c4f1b87 100644 --- a/libavformat/bluray.c +++ b/libavformat/bluray.c @@ -198,7 +198,7 @@ static int bluray_read(URLContext *h, unsigned char *buf, int size) len = bd_read(bd->bd, buf, size); - return len; + return len == 0 ? AVERROR_EOF : len; } static int64_t bluray_seek(URLContext *h, int64_t pos, int whence)