summaryrefslogtreecommitdiffstats
path: root/libmpdemux/demux_mf.c
Commit message (Collapse)AuthorAgeFilesLines
* 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.
* windows support: unicode filenameswm42012-03-091-6/+7
| | | | | | | | | | | | | | | | | | | Windows uses a legacy codepage for char* / runtime functions accepting char *. Using UTF-8 as the codepage with setlocale() is explicitly forbidden. Work this around by overriding the MSVCRT functions with wrapper macros, that assume UTF-8 and use "proper" API calls like _wopen etc. to deal with unicode filenames. All code that uses standard functions that take or return filenames must now include osdep/io.h. stat() can't be overridden, because MinGW-w64 itself defines "stat" as a macro. Change code to use use mp_stat() instead. This is not perfectly clean, but still somewhat sane, and much better than littering the rest of the mplayer code with MinGW specific hacks. It's also a bit fragile, but that's actually little different from the previous situation. Also, MinGW is unlikely to ever include a nice way of dealing with this.
* demux_mf: fix option value allocated with strdupUoti Urpala2011-09-021-1/+2
| | | | | | demux_mf allocated the "type" suboption of "--mf" with strdup if it was not explicitly set. This caused a crash after playing an mf:// entry. Fix to use talloc instead.
* cleanup: remove NULL checks before free() all over the codecboesch2010-11-141-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32624 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)reimar2010-11-021-2/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* Add support for JPEG2000 via FFmpeg/OpenJPEGreimar2010-01-031-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30174 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set demuxer->filepos in mf demuxer, since the stream_tell fallback is notreimar2009-08-171-3/+3
| | | | | | | usable. Fixes progress display in mencoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29530 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow dpx image files as input.cehoyos2009-08-111-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29489 b3059339-0415-0410-9bf9-f77b7e298cf2
* whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-4/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add standard license header to all files in libmpdemux.diego2009-05-081-0/+17
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29280 b3059339-0415-0410-9bf9-f77b7e298cf2
* map jls (jpeg-ls), thm and db (thumbnails) files to jpgcompn2009-03-211-0/+5
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29025 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ffptx , works on ptx samplescompn2008-05-121-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26743 b3059339-0415-0410-9bf9-f77b7e298cf2
* sun rasterfile decodercompn2008-02-251-0/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26102 b3059339-0415-0410-9bf9-f77b7e298cf2
* add ffpcx decoder, works on my samples.compn2008-02-131-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25993 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
* 100l, fix uint32_t* instead of uint32_t typo in demux_mf type->fourcc tablereimar2007-11-181-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25090 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove a pointless #ifdefreimar2007-11-171-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25062 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace if-else constructs for type -> fourcc mapping by a table in demux_mfreimar2007-11-171-13/+24
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25061 b3059339-0415-0410-9bf9-f77b7e298cf2
* add tif support to demux_mfcompn2007-11-141-0/+2
| | | | | | | ok'd by diego and reimar git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25048 b3059339-0415-0410-9bf9-f77b7e298cf2
* BMP support for mf://reimar2007-04-061-0/+2
| | | | | | | Patch by lode leroy [lode_leroy hotmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22921 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
* mf demuxer only works with mf:// urls, so check for that.reimar2007-02-011-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22101 b3059339-0415-0410-9bf9-f77b7e298cf2
* Avoid division by zero DEMUXER_CTRL_GET_PERCENT_POS with only one frame by justreimar2006-09-111-0/+2
| | | | | | | | returning DONTKNOW. A better formula to calculate position would probably be a better fix though. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19800 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement DEMUXER_CTRL_GET_TIME_LENGTH and DEMUXER_CTRL_GET_PERCENT_POS,reimar2006-07-281-1/+18
| | | | | | | patch by Paul-Francois Fontigny pff at filmik be git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19225 b3059339-0415-0410-9bf9-f77b7e298cf2
* fix 3 bugs in libmpdemux/demux_mf.cgpoirier2006-07-261-3/+3
| | | | | | | | | | | | | 1. Relative seek is seeking 1 frame too far. 2. Percent seek is seeking 1 frame too far (beyond EOF) at 100%. 3. Check for EOF is checking 1 frame too far. Patch by Paul-Francois Fontigny < pff AAA filmik PPP be> Original thread: Date: Jul 16, 2006 12:40 PM Subject: [MPlayer-dev-eng] [PATCH] bugfix for libmpdemux/demux_mf.c git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19185 b3059339-0415-0410-9bf9-f77b7e298cf2
* Second-try commit of this patch.corey2006-02-171-1/+1
| | | | | | | | | | | | 1. Include audio_delay as an argument to demux_seek. 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. I've quadruple checked this time; hopefully I haven't missed anything. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17637 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow autodetection of pictures type when using mf://@file.list syntaxiive2006-02-141-3/+5
| | | | | | | autodetection is based on first picture instead of the url git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17625 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reverse commit of unfinished patch for passing audio_delay to the demuxers.corey2006-02-091-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17570 b3059339-0415-0410-9bf9-f77b7e298cf2
* 1. Include audio_delay as an argument to demux_seek.corey2006-02-071-1/+1
| | | | | | | | | | | 2. Modify demux_seek_avi to adjust the audio/video stream positions so that mplayer/mencoder will instantly be in sync even when -delay is specified. Other demuxers could be modified similarly in the future. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17554 b3059339-0415-0410-9bf9-f77b7e298cf2
* Demuxer modularizationrtognimp2005-08-051-4/+21
| | | | | | | Demuxer selection by name with -demuxer command (bakward compatible) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16176 b3059339-0415-0410-9bf9-f77b7e298cf2
* fopen requires binary flag on windows, toofaust32003-04-261-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9993 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix this 10L for wich i got so good bugreports :(((albeu2003-04-201-1/+1
| | | | | | | Thx to Sascha. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9946 b3059339-0415-0410-9bf9-f77b7e298cf2
* add support for sgi files to mencoder patch by (Todd Kirby <slapcat at ↵michael2003-03-051-1/+3
| | | | | | pacbell dot net>) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9535 b3059339-0415-0410-9bf9-f77b7e298cf2
* type autodetection (from filemask/filelist extension)arpi2003-01-281-1/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9149 b3059339-0415-0410-9bf9-f77b7e298cf2
* stream layer cleanup - part 1arpi2002-09-151-33/+21
| | | | | | | | STREAMTYPE_MF removed, using STREAMTYPE_DUMMY instead mf.c/demux_mf updated to do the opening in demux_open instead of stream_open git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7408 b3059339-0415-0410-9bf9-f77b7e298cf2
* TGA images (-mf on:type=tga) supportarpi2002-09-101-2/+4
| | | | | | | patch by Tilman Sauerbeck <tsauerbeck@users.sourceforge.net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7363 b3059339-0415-0410-9bf9-f77b7e298cf2
* Added demuxer uninitalbeu2002-04-241-0/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5811 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add IJPG decoder.pontscho2002-03-101-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5030 b3059339-0415-0410-9bf9-f77b7e298cf2
* add initial mPNG supportpontscho2002-02-111-4/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4657 b3059339-0415-0410-9bf9-f77b7e298cf2
* identify jpg with case-insensitive 'jpg' or 'jpeg' stringalex2002-02-101-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4644 b3059339-0415-0410-9bf9-f77b7e298cf2
* finalize mfi support.pontscho2002-02-071-5/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4566 b3059339-0415-0410-9bf9-f77b7e298cf2
* emulating BITMAPINFOHDR (for win32 codecs)arpi2002-02-061-1/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4557 b3059339-0415-0410-9bf9-f77b7e298cf2
* add mfi demuxerpontscho2002-02-061-0/+103
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4551 b3059339-0415-0410-9bf9-f77b7e298cf2