summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r28366Uoti Urpala2009-01-264-0/+17
|\ | | | | | | | | | | | | | | | | Contains more changes needed to sync build system with latest FFmpeg. Conflicts: Makefile configure mplayer.c
| * Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.diego2009-01-252-0/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28364 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after DECLARE_ASM_CONST/DECLARE_ALIGNED moving within FFmpeg.diego2009-01-252-0/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28362 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28341Uoti Urpala2009-01-1922-98/+95
|\| | | | | | | | | | | Conflicts: configure libmpcodecs/native/rtjpegn.c
| * revert #ifdef WORDS_BIGENDIAN => #if WORDS_BIGENDIAN changes from r28331gpoirier2009-01-164-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28334 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Completely get rid of MMX define, use HAVE_MMX define instead.gpoirier2009-01-161-28/+25
| | | | | | | | | | | | | | Patch by Guillaume LECERF % foxcore A gmail P com % git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28333 b3059339-0415-0410-9bf9-f77b7e298cf2
| * fix compilation on non x86 machines (PPC here)gpoirier2009-01-165-27/+27
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28331 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Another missed #ifdef HAVE_MMXreimar2009-01-161-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28328 b3059339-0415-0410-9bf9-f77b7e298cf2
| * More #ifdef HAVE_MMX etc. missed by earlier search.reimar2009-01-162-9/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28327 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Lots and lots of #ifdef ARCH_... -> #if ARCH_...reimar2009-01-1619-61/+61
| | | | | | | | | | | | | | | | and #ifdef HAVE_MMX etc -> #if HAVE_MMX. There might be still more that need to be fixed. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28325 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28310Uoti Urpala2009-01-155-63/+47
|\ \ | | | | | | | | | | | | | | | | | | | | | The libdvdread4 and libdvdnav directories, which are externals in the svn repository, are at least for now not included in any form. I added configure checks to automatically disable internal libdvdread and libdvdnav if the corresponding directories are not present; if they're added manually then things work the same as in svn.
| * | Revert OSD flicker fixes done better in another branchUoti Urpala2009-01-154-19/+4
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Revert three commits from svn before merging other svn changes to another branch. That branch has better fixes for these issues and the commits would only cause conflicts. The reverted commits are: "Avoid flickering OSD with -vf yadif=1" commit 5904de25e3b78b78ca6ea81e18d436377d426a43 "Fix OSD flicker with tfields as well." commit 8385fa3dc62b51e3395c6206b0901f2e909b8f57 "Fix OSD flickering with filters that add frames (tfields, yadif) and" commit 17ea23ac7467a26aa0919deae506c15641c03afb
| * Fix two more instances of nonstandard license headers.diego2009-01-051-25/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28262 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Sync with latest round of xvmc changes in FFmpeg.diego2009-01-021-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28237 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid unused variable warning.diego2009-01-021-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28233 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reorder #includes and #ifdefs to avoid excessive #ifdeffery.diego2009-01-021-10/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28232 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reorder #includes and #ifdefs to avoid warnings and excessive #ifdeffery.diego2009-01-021-20/+11
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28231 b3059339-0415-0410-9bf9-f77b7e298cf2
| * XVID profile array should be const, so it is in rodatareimar2009-01-011-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28221 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix OSD flickering with filters that add frames (tfields, yadif) andreimar2008-12-301-0/+6
| | | | | | | | | | | | -correct-pts git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28211 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix OSD flicker with tfields as well.reimar2008-12-301-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28210 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid flickering OSD with -vf yadif=1reimar2008-12-303-1/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28209 b3059339-0415-0410-9bf9-f77b7e298cf2
* | OSD: Ensure that OSD content is drawn in filter-added framesUoti Urpala2009-01-152-10/+2
| | | | | | | | | | | | Move the OSD drawing calls from filter_video() to higher-level code to ensure that VOs will draw the OSD also in filter-added frames, which are displayed without a separate call to filter_video().
* | Merge branch 'pause'Uoti Urpala2009-01-157-7/+29
|\ \
| * | core: Better -nocorrect-pts pause and filter-added frames handlingUoti Urpala2009-01-142-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Rewrite the -nocorrect-pts frame creation code. The new version always updates the visible frame when seeking while pausing, and supports filter-added frames. It can not time those properly though. Now the handling of filter-added frames in MPlayer always uses the new method independently of the value of correct-pts but MEncoder still expects the old behavior. Add a global variable that is set under MEncoder only and change the filters to choose behavior based on that instead of the correct_pts option.
| * | Update OSD while pausedUoti Urpala2008-12-095-0/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When OSD contents change while paused, try to change the OSD drawn in the currently visible frame. If such OSD updates are not supported then advance by one frame and draw the OSD normally. Add some support for OSD redrawing to vo xv. The new xv code makes a copy of the original frame contents before drawing the OSD if MPlayer is already paused when the frame is drawn. If such a copy of the current frame exists then the frame contents can be restored and a different OSD drawn on top of the same frame.
* | | Merge svn changes up to r28176Uoti Urpala2008-12-221-2/+2
|\ \ \ | | |/ | |/| | | | | | | | | | Conflicts: libvo/video_out.c libvo/x11_common.c
| * | Fix imaadpcm extradata with lavc encoder.reimar2008-12-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | The formula to calculate frame size was wrong, duplicated code from the encoder and did not take endianness into account when writing the value into extradata. Patch by Edouard Gomez [ed gomez (at) free fr]. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28167 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Merge svn changes up to r28162Uoti Urpala2008-12-191-8/+8
|\| |
| * | xvmc is now a CONFIG_ option in FFmpeg.diego2008-12-151-8/+8
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28154 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Merge svn changes up to r28149Uoti Urpala2008-12-142-7/+41
|\| | | |/ |/|
| * Replace informal GPL notices by standard GPL headers.diego2008-12-131-3/+21
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28145 b3059339-0415-0410-9bf9-f77b7e298cf2
| * license header consistency cosmeticsdiego2008-12-131-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28144 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace informal GPL notes by standard GPL header.diego2008-12-131-4/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28140 b3059339-0415-0410-9bf9-f77b7e298cf2
* | 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 r28087Uoti Urpala2008-12-045-24/+24
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: command.c libao2/ao_ivtv.c libao2/ao_v4l2.c libmpcodecs/dec_video.h libvo/aspect.h libvo/sub.c libvo/sub.h libvo/vo_directx.c libvo/vo_macosx.m libvo/vo_quartz.c mp_core.h mplayer.c mplayer.h osdep/getch2.h osdep/timer.h
| * Get rid of pointless 'extern' keywords.diego2008-12-035-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28085 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28038Uoti Urpala2008-11-252-83/+89
|\|
| * Create a separate codecs.conf entry for Tremor and use it if MPlayer isdiego2008-11-241-0/+4
| | | | | | | | | | | | | | | | with Tremor support instead of libvorbis. Previously MPlayer would show the same output on the console when decoding with libvorbis and Tremor. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28014 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Move up uninit() to avoid a forward declaration.diego2008-11-231-10/+9
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27983 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: consistent function declarations.diego2008-11-231-4/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27982 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove tabs and trailing whitespace.diego2008-11-231-69/+69
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27981 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27899Uoti Urpala2008-11-062-24/+18
|\|
| * Use libavutil FFMIN etc. instead of defining our own variants.reimar2008-11-021-21/+15
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27878 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Avoid pointless casting of void*reimar2008-11-021-3/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27877 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27841Uoti Urpala2008-10-281-1/+1
|\| | | | | | | | | Conflicts: mplayer.c
| * Fix smartblur filter crash due to missing default scaler choice;diego2008-10-271-1/+1
| | | | | | | | | | | | | | | | set bicubic as the default scaler. patch by Kurt Garloff, kurt garloff de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27838 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vd.c: Remove pointless SCREEN_SIZE_[XY] #definesUoti Urpala2008-10-251-7/+4
| | | | | | | | | | The #defines look like they're pointless leftovers from removed code so remove them too.
* | Merge svn changes up to 27824Uoti Urpala2008-10-2531-120/+95
|\| | | | | | | | | | | | | | | | | | | Conflicts: cfg-common-opts.h libmpcodecs/dec_video.c libmpcodecs/vd.c libvo/x11_common.h mplayer.c stream/cache2.c
| * vf_palette: Fix compilation after libswscale API changesuau2008-10-251-8/+8
| | | | | | | | | | | | | | Patch from Guillaume Poirier. I didn't test the functionality of the filter but at least it fixes compilation. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27822 b3059339-0415-0410-9bf9-f77b7e298cf2
| * IWMMXT optimizations were removed from our internal libmpeg2 copy, so nowdiego2008-10-221-3/+1
| | | | | | | | | | | | | | remove it from the library interface code as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27812 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use av_malloc/av_free for audio-related buffers to avoid crashes due toreimar2008-10-182-11/+5
| | | | | | | | | | | | | | | | insufficient alignment on systems without memalign. http://lists.mplayerhq.hu/pipermail/mplayer-dev-eng/2008-October/058743.html git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27799 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace all occurrences of '__volatile__' and '__volatile' by plain 'volatile'.diego2008-10-162-7/+7
| | | | | | | | | | | | | | | | 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-1620-67/+67
| | | | | | | | | | | | | | 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
| * Move SCREEN_SIZE_X/Y definition to libmpcodecs/vd.c where it is used.diego2008-10-161-0/+3
| | | | | | | | | | | | | | config.h should only contain option definitions, no logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27785 b3059339-0415-0410-9bf9-f77b7e298cf2
| * #include necessary libavcodec header and remove duplicated struct declaration.diego2008-10-141-17/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27769 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless '#undef realloc', realloc is not referenced anywhere near.diego2008-10-141-1/+0
|