summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_nut.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove some demuxers and decoderswm42012-07-301-321/+0
| | | | | | | | | | | | | | | | | | Most of these demuxers and decoders are provided in better form by libav, while the mplayer builtin ones are essentially unmaintained. The only legimitate use case for not using the libav ones was working around libav bugs or bugs related to the way mplayer uses libav. Instead of trying to keep dead code alive, development effort should go into improving libav or the mplayer libav glue code. Note that the libav demuxer have been preferred over the mplayer builtin ones for a while in mplayer2. There were some exceptions: playing DVDs with dvdnav or playing network sources. (That's because some stream modules and network.c requested explicit file formats, such as DEMUXER_TYPE_MPEG_PS, which mapped to builtin demuxers.) With this commit, they are switched to use libav. One caveat is that the requested format is not passed to libavformat, instead we rely on the auto probing to select the correct libav demuxer (see code in demux_open_stream()).
* demux, vd_ffmpeg: fix demux keyframe flag, set AV_PKT_FLAG_KEYUoti Urpala2012-07-251-1/+1
| | | | | | | | | | | | | | | | | | There was some confusion about the "flags" field in demuxer packets. Demuxers set it to either 1 or 0x10 to indicate a keyframe (and the field was not used to indicate anything else). This didn't cause visible problems because nothing read the value. Replace the "flags" field with a boolean "keyframe" field. Set AV_PKT_FLAG_KEY based on this field in packets fed to libavcodec video decoders (looks like PNG and ZeroCodec are the only ones which depend on values from demuxer; previously this was hardcoded to true for PNG). Make demux_mf set the keyframe field in every packet. This matters for PNG files now that the demuxer flag is forwarded to libavcodec. Fix logic setting the field in demux_mkv. It had probably not been updated when adding SimpleBlock support. This probably makes no difference for any current practical use.
* cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)reimar2010-11-021-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32181 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32182 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32183 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace some sizeof(type) by sizeof(*pointer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32184 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32186 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32187 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32188 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizoef(type) by sizeof(*ptrvar). Besides being consistent with FFmpeg style, this reduces the size of a patch to rename these types to not conflict with the windows.h definitions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32189 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32191 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32192 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(type) by sizeof(*ptrvar) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32193 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a useless cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32194 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(type) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32195 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a useless cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32196 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace several sizeof(WAVEFORMATEX) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32197 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace one more instance of sizeof(WAVEFORMATEX); fix compilation. patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32199 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid some pointless uses of sizeof() and one related cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32200 b3059339-0415-0410-9bf9-f77b7e298cf2 Merge one malloc() + memset() invocation into calloc(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32202 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32203 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(WAVEFORMATEX) occurrences. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32205 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32206 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(BITMAPINFOHEADER) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
* Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* Merge svn changes up to r29304Uoti Urpala2009-07-071-0/+18
|\
| * Add standard license header to all files in libmpdemux.diego2009-05-081-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-2/+2
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-2/+2
|/ | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* Warning fixes for demux_nutods152008-12-121-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28135 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove resync_audio_stream() from demux_nut seek functionods152008-12-121-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28134 b3059339-0415-0410-9bf9-f77b7e298cf2
* Rename typedefs in demux_nut to _tt instead of _t, sync to new libnut APIods152008-12-121-14/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28133 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix double free in demux_nut, patch by Onur Küçük.ods152008-10-131-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27764 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use defines to give names to the different seek flags.reimar2008-01-291-2/+2
| | | | | | | | A better solution should be considered later, esp. for the many broken demuxers that do not treat these flags correctly. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25911 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make all demuxer_desc_t const, thus moving them to .rodatareimar2008-01-131-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25735 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove silly #ifdef around the complete file.diego2007-08-241-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24138 b3059339-0415-0410-9bf9-f77b7e298cf2
* compilation fix, manually include help_mp.hods152007-04-241-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23102 b3059339-0415-0410-9bf9-f77b7e298cf2
* with -identify show audio and video id; patch by Andrew Savchenko (Bircoph ↵nicodvb2007-04-201-0/+2
| | | | | | list ru) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23028 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the stream/ directory.diego2007-03-151-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22623 b3059339-0415-0410-9bf9-f77b7e298cf2
* remove some lines which should have never been in demux_nut.c, broke CPU ods152007-03-091-3/+0
| | | | | | | percentage meter for audio only files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22502 b3059339-0415-0410-9bf9-f77b7e298cf2
* Sync to libnut, nom->numods152006-12-231-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21739 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix demux_nut to give proper (estimate) of percent position after a seekods152006-11-181-1/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21039 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add disabled EAGAIN testing code for libnutods152006-11-181-6/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21038 b3059339-0415-0410-9bf9-f77b7e298cf2
* move demux_nut priv calloc to init() instead of check_file()ods152006-11-181-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21027 b3059339-0415-0410-9bf9-f77b7e298cf2
* missed piece in update to libnut API - non negative errorsods152006-11-171-2/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20987 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut API, non-negative errorsods152006-11-161-12/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20954 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut, no nut_skip_packet()ods152006-11-151-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20942 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut API, don't free the streamsods152006-11-151-3/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20941 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut, add cache_syncpointsods152006-11-141-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20925 b3059339-0415-0410-9bf9-f77b7e298cf2
* update to libnut, rename nut.h->libnut.hods152006-11-141-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20909 b3059339-0415-0410-9bf9-f77b7e298cf2
* change include "nut.h" to <nut.h> to make gcc pick the correct nut.h for ↵ods152006-11-121-1/+1
| | | | | | libnut de/muxer.. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20868 b3059339-0415-0410-9bf9-f77b7e298cf2
* shut warning on "realloc undefined" in demuxer.hods152006-11-101-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20831 b3059339-0415-0410-9bf9-f77b7e298cf2
* update libnut APIods152006-11-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20830 b3059339-0415-0410-9bf9-f77b7e298cf2
* simplifications, any error from libnut is fatalods152006-09-231-32/+16
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19964 b3059339-0415-0410-9bf9-f77b7e298cf2
* sync to new libnutods152006-09-231-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19963 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add demux_nut to MPlayer repoods152006-09-171-0/+316
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19867 b3059339-0415-0410-9bf9-f77b7e298cf2