summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r27025Uoti Urpala2008-06-072-1/+8
|\ | | | | | | | | | | | | | | | | Conflicts: command.c libvo/vosub_vidix.c libvo/vosub_vidix.h mplayer.c
| * Fix channel order for libvorbis decoder, original patched by Nicolas George.ulion2008-06-071-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27020 b3059339-0415-0410-9bf9-f77b7e298cf2
| * rename AF_CHANNEL_LAYOUT_LAVC_VORBIS* => AF_CHANNEL_LAYOUT_VORBIS*.ulion2008-06-071-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27019 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-0421-152/+156
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * Properly free memory allocate by liba52.reimar2008-06-012-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26955 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert commit r26897.iive2008-05-282-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | XviD is the correct spelling of the codec. You can see it written in the codec own documentation and header files. Prefered name capitalization confirmed in conversation with XviD developer (prunedtree). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26915 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: XviD --> Xviddiego2008-05-272-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26897 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add missing MPLAYER_ prefix to multiple inclusion guards.diego2008-05-171-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26793 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove pointless parentheses from return calls.diego2008-05-1619-151/+151
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-1533-468/+533
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * Use standard license headers.diego2008-05-1328-434/+482
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26759 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Factorize "int i".michael2008-05-111-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26735 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Fix unknow vs. unknowN typo.diego2008-05-111-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26733 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reformat very ugly code.michael2008-05-101-15/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26726 b3059339-0415-0410-9bf9-f77b7e298cf2
| * AVOption support for video encoders.michael2008-05-101-0/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26725 b3059339-0415-0410-9bf9-f77b7e298cf2
| * AVOptions support for libavcodec based video decoders.michael2008-05-101-0/+12
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26724 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reindent for last commit.ulion2008-05-081-16/+16
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26694 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Distinguish between ac3 and dts by format tag.ulion2008-05-081-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26693 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26680Uoti Urpala2008-05-072-12/+21
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Relicense file as GPL v2+; bero granted permission on IRC.diego2008-05-071-11/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26679 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable Alpha/ARM optimizations in libmpeg2.diego2008-05-011-1/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26626 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26587Uoti Urpala2008-04-295-5/+5
|\| | | | | | | | | | | | | | | Conflicts: Makefile configure osdep/timer-darwin.c
| * Use consistent #include paths without "../".diego2008-04-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26576 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Consistently #include mpbswap.h instead of bswap.h everywhere.diego2008-04-284-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26574 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26555Uoti Urpala2008-04-281-1/+1
|\|
| * Only compile libmpcodecs/ve_qtvideo.c on Windows.diego2008-04-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26545 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vd.c: Make extern decoder declarations constUoti Urpala2008-04-261-23/+23
| | | | | | | | | | | | The earlier commit "Make video decoder description structs const" made the definitions const but didn't change the extern declarations in vd.c to match. Fix those to be const too.
* | Make audio decoder description structs constUoti Urpala2008-04-2629-56/+56
| | | | | | | | | | | | Make the per-decoder struct ad_functions and its ->info struct constants. Same for the mpcodecs_ad_drivers[] table of pointers to those structs.
* | vf_divtc.c: Make pointlessly static variable a normal localUoti Urpala2008-04-261-1/+1
| | | | | | | | | | | | Apparently because it was declared together with local constant tables (for which the "static" part was useless but harmless) a pointer variable was also declared static.
* | Mark some constant symbols as suchUoti Urpala2008-04-2613-30/+30
| |
* | Merge svn changes up to r26540Uoti Urpala2008-04-261-153/+0
|\| | | | | | | | | | | Conflicts: Makefile
| * Merge libmpcodecs/Makefile into top-level Makefile.diego2008-04-241-153/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26514 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Move vf_settings to options structUoti Urpala2008-04-262-3/+5
| |
* | Move vo_gamma_* to options structUoti Urpala2008-04-261-21/+10
| |
* | Make video decoder description structs constUoti Urpala2008-04-2526-33/+33
| | | | | | | | | | | | 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.
* | Move vd_use_slices to options structUoti Urpala2008-04-254-8/+3
| |
* | Remove global vo_flagsUoti Urpala2008-04-251-4/+3
| | | | | | | | Move the information to struct sh_video field.
* | vd.c: Cosmetic changes + remove malloc.hUoti Urpala2008-04-251-15/+6
| | | | | | | | | | Adjust formatting slightly and remove some comments. Also remove "#include malloc.h" which seems completely irrelevant.
* | Reformat vd.cUoti Urpala2008-04-251-189/+221
| | | | | | | | | | "indent -kr -l79 -nut dec_video.c --ignore-newlines vd.c", fix two "sh_video_t * sh" to "sh_video_t *sh" by hand.
* | Move movie_aspect to options structUoti Urpala2008-04-251-2/+1
| |
* | Move screen_size_xy to options structUoti Urpala2008-04-252-11/+8
| |
* | Move opt_screen_size_[x|y] to options structUoti Urpala2008-04-256-25/+21
| |
* | Move flip and softzoom to options structUoti Urpala2008-04-251-9/+7
| |
* | Move vidmode to options structUoti Urpala2008-04-251-3/+2
| |
* | Move fullscreen to options structUoti Urpala2008-04-251-2/+2
| |
* | Store video decoder functions in struct sh_video fieldUoti Urpala2008-04-252-28/+30
| | | | | | | | | | | | 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.
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-2589-378/+378
| | | | | | | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* | 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 -lavdopts to options structUoti Urpala2008-04-251-68/+54
| |
* | vd_ffmpeg.c: Eliminate some compiler warningsUoti Urpala2008-04-251-5/+5
| | | | | | | | | | Make the functions used in avctx->draw_horiz_band match its type (add a "const"). Add cast to avoid void * arithmetic.
* | Move global vo_config_count to vo structUoti Urpala2008-04-231-10/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove the global and Add a corresponding field to the vo struct, plus another which tells whether the LAST config call was successful.The latter value which tells whether the VO should be properly configured at the moment seems a better match for the semantics actually needed in most places where the old value was used. The 'count' field with the old semantics is not currently used by anything, but I'm leaving it there for vo drivers which would need those semantics if converted to use the struct. Existing uses of the global outside old vo drivers are either converted to use the struct field or moved inside the vo_xyz() calls (instead of "if (vo_config_count) vo_flip_page(..." just call vo_flip_page which will now do nothing if not configured). The removal of the check in mpcommon.c/update_subtitles() is less trivial than the others, but I think it shouldn't cause problems.
* | vf.c: malloc+memset -> callocUoti Urpala2008-04-231-2/+1
| |
* | Move correct_pts to options structUoti Urpala2008-04-233-9/+13
| |
* | Add option pointer to vf structUoti Urpala2008-04-234-17/+25
| |
* | Add context variable to vo_draw_text callbackUoti Urpala2008-04-231-2/+2
| | | | | | | | | | Add a context variable and rename the function to osd_draw_text. Create a new vo_draw_text that is a wrapper for VOs using old API.
* | Add new video driver APIUoti Urpala2008-04-231-25/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | Create new video driver API that has a per-instance context structure and does not rely on keeping status in global or static variables. Existing drivers are not yet converted to this API; instead there is a wrapper which translates calls to them. In the new API, an old API call vo_functions->xyz(args) is generally replaced by vo_xyz(vo_instance, args). The changes to keep the vesa, dxr2 and xover drivers compiling have not been tested.
* | Change VOCTRL_[GET|SET]_EQUALIZER argument passingUoti Urpala2008-04-231-2/+4
|/ | | | | | | | These were the only voctrl types with more than one argument. The second argument was passed using variable arguments. Change them to use a single argument (address of a struct containing both old arguments). This makes forwarding the arguments to other functions easier and allows simplifying code.
* Set dll_type and rv_handle for drvc.dllzuxy2008-04-131-1/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26430 b3059339-0415-0410-9bf9-f77b7e298cf2
* Restore grayscale decoding support with FFmpeg.diego2008-04-132-0/+6
| | | | | | | Removing support was done due to a silly misunderstanding. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26427 b3059339-0415-0410-9bf9-f77b7e298cf2
* Backport SSE2-optimized IDCT routines from upstream libmpeg2.diego2008-04-121-0/+2
| | | | | | | Thanks to Alexander Strange for finding and fixing some bugs. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26425 b3059339-0415-0410-9bf9-f77b7e298cf2
* Oops...should be "drv43260.dll" instead of "drv34260.dll"zuxy2008-04-121-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26421 b3059339-0415-0410-9bf9-f77b7e298cf2
* Cosmetic fix for r26419zuxy2008-04-121-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26420 b3059339-0415-0410-9bf9-f77b7e298cf2
* Dlls can be relocated when loading so rely on filename instead of absolutezuxy2008-04-121-3/+2
| | | | | | | address to check if it's drv43260.dll and hence needs patching. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26419 b3059339-0415-0410-9bf9-f77b7e298cf2
* Indentation fix for r26417zuxy2008-04-121-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26418 b3059339-0415-0410-9bf9-f77b7e298cf2
* Don't print "Could not patch" messages when we haven't actually tried to patch.zuxy2008-04-121-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26417 b3059339-0415-0410-9bf9-f77b7e298cf2
* Check for drvc.dll entries for mingw32zuxy2008-04-121-0/+11
| | | |