0995641202
avformat/mpeg: add missing check
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2018-04-01 21:08:16 +02:00
1f7705e5b1
avformat/mpeg: fix logic failure
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2018-04-01 20:58:48 +02:00
7643e27528
avformat/mpeg: fix detection and demuxing of raw AC3 in mpegps
...
Fixes #4889 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2018-04-01 20:53:43 +02:00
52e97814a1
avformat/mpeg: fix PCM-DVD mis-detection as MLP
...
Fixes #6563 .
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2018-04-01 20:43:54 +02:00
18ac642359
avformat: migrate to AVFormatContext->url
...
Signed-off-by: Marton Balint <cus@passwd.hu>
2018-01-28 23:06:43 +01:00
86be73c7c1
avformat/mpeg: zero initialize idx_pkt
...
Prevents use of uninitialized stack.
Signed-off-by: James Almer <jamrial@gmail.com>
2017-09-23 19:37:21 -03:00
4de591e6fb
Merge commit '83548fe894cdb455cc127f754d09905b6d23c173'
...
* commit '83548fe894cdb455cc127f754d09905b6d23c173':
lavf: fix usage of AVIOContext.seekable
Merged-by: James Almer <jamrial@gmail.com>
2017-03-21 17:02:30 -03:00
a5c1c7a8b3
lavf/mpeg: Initialize a stack variable used by memcmp().
...
Silence a valgrind warning.
Fixes ticket #6160 .
2017-02-21 02:15:08 +01:00
4e5049a230
avformat/mpeg: Adjust vid probe threshold to correct mis-detection
...
Fixes: _ij.mp3
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2016-11-23 00:54:45 +01:00
83548fe894
lavf: fix usage of AVIOContext.seekable
...
It is supposed to be a flag. The only currently defined value is
AVIO_SEEKABLE_NORMAL, but other ones may be added in the future.
However all the current lavf code treats this field as a bool (mainly
for historical reasons).
Change all those cases to properly check for AVIO_SEEKABLE_NORMAL.
2016-09-30 16:54:33 +02:00
8ef57a0d61
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
...
* commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb':
cosmetics: Fix spelling mistakes
Merged-by: Clément Bœsch <u@pkh.me>
2016-06-21 21:55:34 +02:00
41ed7ab45f
cosmetics: Fix spelling mistakes
...
Signed-off-by: Diego Biurrun <diego@biurrun.de>
2016-05-04 18:16:21 +02:00
0f40c90984
Drop pointless assert.h #includes
2016-05-03 15:45:10 +02:00
6f69f7a8bf
Merge commit '9200514ad8717c63f82101dc394f4378854325bf'
...
* commit '9200514ad8717c63f82101dc394f4378854325bf':
lavf: replace AVStream.codec with AVStream.codecpar
This has been a HUGE effort from:
- Derek Buitenhuis <derek.buitenhuis@gmail.com>
- Hendrik Leppkes <h.leppkes@gmail.com>
- wm4 <nfxjfg@googlemail.com>
- Clément Bœsch <clement@stupeflix.com>
- James Almer <jamrial@gmail.com>
- Michael Niedermayer <michael@niedermayer.cc>
- Rostislav Pehlivanov <atomnuker@gmail.com>
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-04-10 20:59:55 +01:00
fb9036b314
lavf/mpeg: Identify sub-stream ID 0xa1 as mlp.
...
Fixes ticket #4786 .
Auto-detection seems difficult, patch mostly confirmed by
http://dvd-audio.sourceforge.net/spec/aob.shtml
2016-03-09 14:12:18 +01:00
93629735d7
avformat: Add a protocol blacklisting API
...
Signed-off-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
2016-03-04 16:13:42 +00:00
9200514ad8
lavf: replace AVStream.codec with AVStream.codecpar
...
Currently, AVStream contains an embedded AVCodecContext instance, which
is used by demuxers to export stream parameters to the caller and by
muxers to receive stream parameters from the caller. It is also used
internally as the codec context that is passed to parsers.
In addition, it is also widely used by the callers as the decoding (when
demuxer) or encoding (when muxing) context, though this has been
officially discouraged since Libav 11.
There are multiple important problems with this approach:
- the fields in AVCodecContext are in general one of
* stream parameters
* codec options
* codec state
However, it's not clear which ones are which. It is consequently
unclear which fields are a demuxer allowed to set or a muxer allowed to
read. This leads to erratic behaviour depending on whether decoding or
encoding is being performed or not (and whether it uses the AVStream
embedded codec context).
- various synchronization issues arising from the fact that the same
context is used by several different APIs (muxers/demuxers,
parsers, bitstream filters and encoders/decoders) simultaneously, with
there being no clear rules for who can modify what and the different
processes being typically delayed with respect to each other.
- avformat_find_stream_info() making it necessary to support opening
and closing a single codec context multiple times, thus
complicating the semantics of freeing various allocated objects in the
codec context.
Those problems are resolved by replacing the AVStream embedded codec
context with a newly added AVCodecParameters instance, which stores only
the stream parameters exported by the demuxers or read by the muxers.
2016-02-23 17:01:58 +01:00
cb14d30240
lavf/mpeg: use FFERROR_REDO instead of AVERROR(EAGAIN).
2015-12-03 19:16:12 +01:00
c2f861ca42
Replace remaining occurances of av_free_packet with av_packet_unref
2015-10-27 14:35:30 +01:00
5c93e57f5c
avformat/vobsub: do not attempt to check duplicate subtitles
...
Some .idx files actually contain duplicate subtitle events:
timestamp: 00:07:52:600, filepos: 00004e800
timestamp: 00:07:52:600, filepos: 00004f800
The second will be dropped, because it has same pts, duration, and text
(the text is just a dummy empty string; the real data is retrieved when
actually reading vobsub subtitle packets).
Dropping this is probably not intended/safe, so avoid it.
See trac issue #4872 for a sample. This patch doesn't fix decoding of
the sample, though.
2015-09-21 13:43:32 +02:00
a47ad06baf
avformat/vobsub: compare correct packet stream IDs
...
The stream ID is essentially an arbitrary number defined by the .idx
file headers. They have to match the IDs in the .sub stream. The vobsub
demuxer assumed the IDs would just start from 0, increassing by 1 for
each stream. This is not correct. In the sample I had, the IDs were
starting from 1, leading to no subtitles being displayed at all.
Fix this by using the correct stream ID.
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
2015-09-21 12:55:13 +02:00
af924fd9e4
avformat/subtitles: forward log context in ff_subtitles_queue_finalize() for logging
2015-09-10 21:40:07 +02:00
9bd305be91
lavf/mpeg: Allow users to force audio codec MLP.
...
Fixes part of ticket #4786 .
2015-08-20 12:19:00 +02:00
ee8c18387d
lavf/mpeg: Do not detect unknown audio in Hikvision streams as alaw.
2015-05-17 12:57:27 +02:00
57865a9747
avformat/mpeg: put timestamp trace av_logs under FF_DEBUG_TS
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 17:41:22 +02:00
40d552dae6
Merge commit '1a3eb042c704dea190c644def5b32c9cee8832b8'
...
* commit '1a3eb042c704dea190c644def5b32c9cee8832b8':
Replace av_dlog with normal av_log at trace level
Conflicts:
ffplay.c
libavdevice/fbdev_dec.c
libavfilter/avfilter.c
libavfilter/internal.h
libavfilter/setpts.c
libavfilter/src_movie.c
libavfilter/vf_crop.c
libavfilter/vf_drawtext.c
libavfilter/vf_fieldorder.c
libavformat/assdec.c
libavformat/avidec.c
libavformat/flvdec.c
libavformat/http.c
libavformat/ipmovie.c
libavformat/isom.c
libavformat/mov.c
libavformat/mpegenc.c
libavformat/mpegts.c
libavformat/mpegtsenc.c
libavformat/mux.c
libavformat/mxfdec.c
libavformat/nsvdec.c
libavformat/oggdec.c
libavformat/r3d.c
libavformat/rtspdec.c
libavformat/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-20 03:19:47 +02:00
1a3eb042c7
Replace av_dlog with normal av_log at trace level
...
This applies to every library where performance is not critical.
2015-04-19 12:41:59 +01:00
c69ff12dc3
lavf/mpeg: vobsub add an option to specify the .sub's URI
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-04-13 11:55:55 +02:00
036079ce34
lavf/mpeg: Support alaw in Hikvision CCTV recordings.
...
Fixes a sample from ticket #4182 .
2015-04-03 21:13:50 +02:00
f8413f74a1
lavf/mpeg: Support more audio codecs in Hikvision CCTV recordings.
...
Fixes a sample from ticket #4182 .
2015-04-03 21:13:50 +02:00
ca8617a04d
avformat/mpeg: remove unneeded #include, there are no assert() only av_assert*
...
Signed-off-by: Paul B Mahol <onemda@gmail.com>
2015-01-31 08:57:06 +00:00
8d7d88135c
avformat/mpeg: Avoid dead assignment
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2015-01-14 00:06:43 +01:00
74080ded96
avformat/mpeg: add commented out av_log() to probe
...
This is commonly needed for debugging mis-detections
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 22:38:38 +01:00
e15b29bb18
avformat/mpeg: do not count PES packets inside PES packets during probing
...
Fixes: misdetection of test2.mp3
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-12-06 22:34:10 +01:00
51ddaf6549
avformat/mpeg: fix memleak of sub_name on error
...
Fixes CID1254666
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-11-16 19:17:34 +01:00
ff03df6475
avformat/mpeg: Use av_find_input_format() instead of directly linking to the demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-25 16:28:41 +02:00
4641ae352e
avformat: Add and use ff_copy_whitelists()
...
Fixes potential security issue in case of running out of memory
Found-by: ubitux
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-24 19:23:23 +02:00
ad83cfec5a
avformat/mpeg: Forward whitelists to the mpegps demuxer
...
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-10-23 18:19:37 +02:00
d86cf4a91d
avformat/vobsub: fix NULL dereference
2014-09-13 15:15:32 +02:00
f7bbe0f414
avformat/mpeg: update comment on probe score
...
Found-by: Timothy Gu <timothygu99@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 02:51:59 +02:00
5109ce2017
avformat/mpeg: increase score for short mpeg-ps by 1
...
Fixes Ticket 3855
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-09-09 01:10:55 +02:00
d34ec64a22
replace calls to url_feof() with avio_feof()
...
Signed-off-by: James Almer <jamrial@gmail.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-08-08 00:48:38 +02:00
88f2586adb
fix various typos
...
Signed-off-by: Lou Logan <lou@lrcd.com>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
2014-06-03 10:58:19 -08:00
cba92a2226
avformat/vobsub: do not create empty streams.
...
Fixes NULL dereference in vobsub_read_packet() on vobsub->q[i]->subs.
Fixes ticket #3669 .
2014-05-24 11:08:34 +02:00
b7dd250b75
avformat/vobsub: use av_make_q().
2014-05-01 16:18:12 +02:00
6a3a7d7af1
avformat/vobsub: remove pointless FAIL macro.
2014-05-01 16:16:54 +02:00
fecebb7aba
Merge commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7'
...
* commit '5b8f0a5eac75d16376af60a6f6bb79b3e9e6dab7':
mpeg: K&R formatting cosmetics
Conflicts:
libavformat/mpeg.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
2014-03-24 05:28:07 +01:00
5b8f0a5eac
mpeg: K&R formatting cosmetics
...
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
2014-03-24 02:22:15 +01:00
af7562a035
Ignore es_map_length when parsing mpeg program stream map.
...
Fixes ticket #3195 .
2013-12-05 21:17:21 +01:00
4ba90392bc
Support AC-3 in Sega Dreamcast Sofdec files.
...
Fixes ticket #3184
2013-12-01 12:02:21 +01:00
Paul B Mahol
Marton Balint
James Almer
Carl Eugen Hoyos
Michael Niedermayer
Anton Khirnov
Clément Bœsch
Vittorio Giovara
Diego Biurrun
Derek Buitenhuis
Nicolas George
Hendrik Leppkes
wm4
Michael Niedermayer
Rodger Combs
Lou Logan
Tanja Batchelor