summaryrefslogtreecommitdiff
path: root/libavformat/bluray.c
Commit message (Collapse)AuthorAgeFilesLines
* lavf/bluray: translate a read of 0 to EOFJan Ekström2018-05-061-1/+1
| | | | | | | 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.
* Merge commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d'Derek Buitenhuis2016-02-291-1/+1
| | | | | | | | | | | This commit also disables the async fate test, because it used internal APIs in a non-kosher way, which no longer exists. * commit '2758cdedfb7ac61f8b5e4861f99218b6fd43491d': lavf: reorganize URLProtocols Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
* Merge commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9'Michael Niedermayer2012-09-051-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'e6153f173a49e5bfa70b0c04d2f82930533597b9': avopt: Store defaults for AV_OPT_TYPE_INT in the i64 union member Conflicts: libavcodec/libopenjpegdec.c libavcodec/libopenjpegenc.c libavcodec/libx264.c libavcodec/mpeg12enc.c libavcodec/options_table.h libavcodec/snowenc.c libavcodec/tiffenc.c libavdevice/v4l2.c libavdevice/x11grab.c libavfilter/af_amix.c libavfilter/af_asyncts.c libavfilter/af_join.c libavfilter/buffersrc.c libavfilter/src_movie.c libavfilter/vf_delogo.c libavfilter/vf_drawtext.c libavformat/http.c libavformat/img2dec.c libavformat/img2enc.c libavformat/movenc.c libavformat/mpegenc.c libavformat/mpegtsenc.c libavformat/options_table.h libavformat/segment.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
* lavf: add missing new line to some error messagesPiotr Bandurski2012-09-011-1/+1
| | | | Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
* bluray protocolPetri Hintukainen2012-03-031-0/+235
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>