summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/dec_video.c
Commit message (Collapse)AuthorAgeFilesLines
* Work around vo gl/libass subtitle timing problemUoti Urpala2008-12-091-1/+1
| | | | | | | | | | vo gl generates bitmaps for EOSD content (libass subtitles) when DRAW_EOSD is called but actual drawing of both EOSD and OSD is done in draw_osd(). Since draw_osd() was called first it drew the EOSD content from the previous frame, so the subtitles were always one frame late. As a simple workaround update EOSD content first, then normal OSD. This makes vo gl work correctly and should have no effect on anything else.
* Merge svn changes up to 27824Uoti Urpala2008-10-251-2/+2
|\ | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.diego2008-10-161-2/+2
| | | | | | | | | | | | | | | | We were using an inconsistent mix of the three variants and 'volatile' should be the most correct and portable variant. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27791 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change all occurrences of asm and __asm to __asm__, same as was done for FFmpeg.diego2008-10-161-2/+2
| | | | | | | | | | | | | | Neither variant is valid C99 syntax, but __asm__ is the most portable variant. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27788 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27441Uoti Urpala2008-08-081-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h command.c configure input/input.c libmpcodecs/dec_video.c libmpcodecs/vd.c libmpdemux/stheader.h libvo/sub.c libvo/video_out.c libvo/vo_xv.c libvo/vosub_vidix.c libvo/x11_common.c libvo/x11_common.h mp_core.h mplayer.c stream/stream.h
| * Give a CONFIG_ prefix to preprocessor directives that lacked one anddiego2008-08-071-3/+3
| | | | | | | | | | | | | | change arbitrary prefixes to CONFIG_. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27429 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27374Uoti Urpala2008-07-301-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h cfg-mplayer.h command.c configure libmpcodecs/dec_video.c libmpcodecs/vd.c libmpcodecs/vf_vo.c libmpdemux/demuxer.h libmpdemux/stheader.h mp_core.h mplayer.c stream/stream_radio.c
| * Start unifying names of internal preprocessor directives.diego2008-07-301-1/+1
| | | | | | | | | | | | | | | | Replace all USE_ prefixes by CONFIG_ prefixes to indicate options which are configurable. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27373 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Create a context struct for OSD stateUoti Urpala2008-06-241-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This commit creates the struct and passes it to some functions that needs to access OSD state but does not yet move much data from globals to it. vf_expand accesses the OSD state for rendering purposes outside of the normal OSD draw time. The way this currently works is suboptimal, but I did not attempt to clean it up now. To keep things working the same way vf_expand needs to know the address of the state object to be able to access the data even in the functions that should normally not need it. For that purpose this commit adds a VFCTRL to tell vf_expand the address of the object.
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-3/+3
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of the conflicts are trivial. Conflicts: Makefile cfg-mplayer.h input/input.c libmenu/vf_menu.c libmpcodecs/dec_video.c libmpcodecs/vf_expand.c libmpcodecs/vf_vo.c libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/demuxer.h libvo/vo_directfb2.c libvo/vo_gl.c libvo/vo_winvidix.c libvo/vo_xv.c libvo/vo_xvidix.c libvo/vo_xvmc.c libvo/x11_common.c mplayer.c osdep/timer-linux.c stream/cache2.c
| * cosmetics: Remove pointless parentheses from return calls.diego2008-05-161-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Make video decoder description structs constUoti Urpala2008-04-251-7/+7
| | | | | | | | | | | | This makes the per-decoder struct vd_functions and its ->info struct constants. Same for the mpcodecs_vd_drivers[] table of pointers to those structs.
* | Store video decoder functions in struct sh_video fieldUoti Urpala2008-04-251-24/+28
| | | | | | | | | | | | Remove the global variable mpvdec and move the video decoder pointer to struct sh_video field vd_driver. Audio already had a similar ad_driver field from before.
* | dec_video.c: A couple of cosmetic changesUoti Urpala2008-04-251-12/+7
| |
* | Reformat dec_video.cUoti Urpala2008-04-251-255/+293
| | | | | | | | | | | | "indent -kr -l79 -nut dec_video.c --ignore-newlines dec_video.c", fix some "unknown_typedef * arg" in parameter lists by hand to "unrecognized_typedef *arg".
* | Move correct_pts to options structUoti Urpala2008-04-231-2/+4
|/
* typo fix: inited --> initializeddiego2008-02-141-11/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Replace the persistent CODECS_FLAG_SELECTED by a local "stringset" withreimar2008-01-121-8/+11
| | | | | | | | | an almost-trivial implementation. This allows making the builtin codec structs const, and it also makes clearer that this "selected" status is not used outside the init functions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25689 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make init_video function in dec_video static, it is not used outside that file.reimar2007-12-111-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25354 b3059339-0415-0410-9bf9-f77b7e298cf2
* get/set video colors string is constantreimar2007-12-021-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25252 b3059339-0415-0410-9bf9-f77b7e298cf2
* Clean up the way get_path is handled: Compile get_path.c to an object to linkdiego2007-08-281-2/+0
| | | | | | | | against instead of directly #including the C file and replace the many extern declarations by a proper header file. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24262 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove redundant variable declaration.diego2007-08-251-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24163 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add explicit location for headers from the libmpdemux/ directory.diego2007-03-151-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22619 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@22617 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow demuxers to return packets with no pts in -correct-pts modeuau2007-03-111-3/+10
| | | | | | | | | as long as there are enough pts values for frames that the decoder returns. This should allow passing NAL units individually. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22516 b3059339-0415-0410-9bf9-f77b7e298cf2
* Reindent messy functions before working on themuau2007-03-111-68/+71
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22515 b3059339-0415-0410-9bf9-f77b7e298cf2
* Discard earlier failure in building filter chain when trying a new codec.reimar2007-03-031-0/+3
| | | | | | | | Avoids an incorrect "FATAL: Could not initialize video filters (-vf) or video output (-vo)." message in some rare cases. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22423 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add global field dominance flag instead of duplicating this "everywhere"reimar2007-02-021-0/+7
| | | | | | | Patch by Carl Eugen Hoyos (cehoyos (at) ag or at) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22104 b3059339-0415-0410-9bf9-f77b7e298cf2
* Implement FIXME: Restore original width/height when CODECS_FLAG_ALIGN16reimar2007-01-271-6/+15
| | | | | | | is set and codec init failed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22030 b3059339-0415-0410-9bf9-f77b7e298cf2
* Update OSD contents only after the correct values for the frame are known.uau2006-11-141-10/+12
| | | | | | | | | | | The most visible inaccuracy caused by the previous update location was that the OSD always showed position 0 after seeking with demux_mkv. Split frame decoding and filtering because with -correct-pts the pts value that should be displayed for the frame is only known after decoding but is needed before filtering (during which the OSD is drawn). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20918 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add VFCTRL_DRAW_EOSD.eugeni2006-08-241-1/+6
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19527 b3059339-0415-0410-9bf9-f77b7e298cf2
* old 10l: do not try to compile mmx code if we do not have mmxrfelker2006-07-191-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19135 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add a new video pts tracking mode, enabled by option -correct-pts.uau2006-07-061-0/+47
| | | | | | | | | | | | | | This mode has the following differences: - Video timing is correct for streams with B frames, at least with some demuxers. - Video filters can modify frame timestamps and insert new frames, and removing frames is handled better than before. - Some things are known to break, it's not usable as the default yet. Things should work as before when the -correct-pts option is not used. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18922 b3059339-0415-0410-9bf9-f77b7e298cf2
* get_path as const, patch by Stefan Huehner, stefan AT huehner-orgreynaldo2006-07-031-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18894 b3059339-0415-0410-9bf9-f77b7e298cf2
* Get ride of the several if(identify) messy lines and rearangment of some of ↵reynaldo2006-04-241-2/+1
| | | | | | the output, both patches by Kiriuja mplayer-patches AT en-directo_net, his changes are barely unrelated, nevertheless Im commiting them thogeter just for the sake of my mental healt, I had both patches already applied on my local three git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18238 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add properties for the tv input color controls.albeu2006-04-221-1/+1
| | | | | | | | Make the "normal" color controls fallback on the tv ones if not available from vf/vo. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18191 b3059339-0415-0410-9bf9-f77b7e298cf2
* feed something (hopefully correct timestamps) into the video filter chainmichael2006-03-211-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17911 b3059339-0415-0410-9bf9-f77b7e298cf2
* passing pts through the filter layer (lets see if pts or cola comes out at ↵michael2006-03-211-1/+1
| | | | | | the end) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17907 b3059339-0415-0410-9bf9-f77b7e298cf2
* Patch by Stefan Huehner / stefan % huehner ! org \rathann2006-02-091-1/+1
| | | | | | | | | | | | | | | | | | | | | | patch replaces '()' for the correct '(void)' in function declarations/prototypes which have no parameters. The '()' syntax tell thats there is a variable list of arguments, so that the compiler cannot check this. The extra CFLAG '-Wstrict-declarations' shows those cases. Comments about a similar patch applied to ffmpeg: That in C++ these mean the same, but in ANSI C the semantics are different; function() is an (obsolete) K&R C style forward declaration, it basically means that the function can have any number and any types of parameters, effectively completely preventing the compiler from doing any sort of type checking. -- Erik Slagter Defining functions with unspecified arguments is allowed but bad. With arguments unspecified the compiler can't report an error/warning if the function is called with incorrect arguments. -- Måns Rullgård git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17567 b3059339-0415-0410-9bf9-f77b7e298cf2
* Make a few more messages translatable by moving them into help_mp-en.h.diego2005-10-181-1/+1
| | | | | | | patch by Paul TT < paultt == at == hackerjournal == dot == it > git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16794 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10lattila2005-08-311-1/+1
| | | | | | | variables have to be declared before any command. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16326 b3059339-0415-0410-9bf9-f77b7e298cf2
* Allow forcing of demuxers and codecs by prepending '+'reimar2005-08-301-3/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16322 b3059339-0415-0410-9bf9-f77b7e298cf2
* adds some more -identify output, patch by kiriuja < mplayer DASH patches PAM ↵gpoirier2005-06-201-0/+2
| | | | | | en DASH directo POUM net> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@15790 b3059339-0415-0410-9bf9-f77b7e298cf2
* flushing stuff after seeking (finally we can view MPEG without thouse blocks ↵michael2004-02-181-0/+5
| | | | | | after seeking with -vc ffmpeg12) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11978 b3059339-0415-0410-9bf9-f77b7e298cf2
* codecs.conf is obsolete.diego2003-08-221-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10684 b3059339-0415-0410-9bf9-f77b7e298cf2
* renames: DATADIR->MPLAYER_DATADIR, CONFDIR->MPLAYER_CONFDIR, ↵arpi2003-06-091-3/+3
| | | | | | LIBDIR->MPLAYER_LIBDIR git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10273 b3059339-0415-0410-9bf9-f77b7e298cf2
* moving postprocess code to libavcodecmichael2003-02-141-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9427 b3059339-0415-0410-9bf9-f77b7e298cf2
* linux->osdeparpi2003-02-091-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9381 b3059339-0415-0410-9bf9-f77b7e298cf2
* dlopen() support for ad and vdalex2002-11-111-0/+40
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8153 b3059339-0415-0410-9bf9-f77b7e298cf2
* *HUGE* set of compiler warning fixes, unused variables removalarpi2002-11-061-0/+2
| | | | | | | based on patch by Dominik Mierzejewski <dominik@rangers.eu.org> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8124 b3059339-0415-0410-9bf9-f77b7e298cf2
* verbose can be negativearpi2002-11-011-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8028 b3059339-0415-0410-9bf9-f77b7e298cf2
* -vc/-vfm accepts codec/driver _list_ now. empty list element for -vc meansarpi2002-09-261-10/+25
| | | | | | | *, ie search all codecs. codec name starting with - disables the codec. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7507 b3059339-0415-0410-9bf9-f77b7e298cf2
* best audio/video codec selection & init moved to libmpcodecsarpi2002-09-251-0/+33
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7503 b3059339-0415-0410-9bf9-f77b7e298cf2
* changing return type of put_image void->intarpi2002-09-101-3/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7369 b3059339-0415-0410-9bf9-f77b7e298cf2
* 100l... sh->vcodec may be changed by mpvdec->decode()arpi2002-08-311-1/+2
| | | | | | | it caused various crashes, including the mencoder+ijpg one reported by goth git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7211 b3059339-0415-0410-9bf9-f77b7e298cf2
* -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/commentsarpi2002-08-311-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7192 b3059339-0415-0410-9bf9-f77b7e298cf2
* -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and ↵arpi2002-08-301-6/+7
| | | | | | makes dlopen()'ing possible git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7181 b3059339-0415-0410-9bf9-f77b7e298cf2
* finally removed query_vaa, bes_da and vo_tune_info - the obsoleted libvo apialex2002-08-281-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7125 b3059339-0415-0410-9bf9-f77b7e298cf2
* messages moved from dec_??d?o.cjaf2002-08-131-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@6990 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add the control VFCTRL_CHANGE_RECTANGLEkmkaplan2002-08-041-0/+15
| | | | | | | | print the rectangle boundaries. vf_rectangle accepts stride. Is this correct? git-svn-id: s