summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r29752Uoti Urpala2009-10-067-42/+23
|\ | | | | | | | | | | | | | | | | As part of merging subtitle-in-terminal changes make update_subtitles() only clear existing subtitles if called with the reset argument, and not try to set new ones. Later calls should set the needed new subtitles, and this change avoids some problems with trying to set subtitles when mp_property_sub() in command.c gets called from initialization code before full initialization.
| * Mark some functions that do not need external visibility as static.diego2009-09-302-2/+2
| | | | | | | | | | | | | | patch by Alexander Neumann, alexander bumpern de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29744 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reduce console output verbosity: Move colorspace information to verbose mode.diego2009-09-301-2/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29742 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change type to avoid void * arithmetic.reimar2009-09-251-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29716 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Set codec_type and codec_id in codec context for lavc encoders.reimar2009-09-252-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29715 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure avctx->codec_type and codec_id are set, since libavcodecreimar2009-09-232-0/+3
| | | | | | | | | | | | | | | | | | currently requires that. That probably is an unintended API change and should be fixed/reverted in lavc but it hurts little to workaround here. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29709 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use x264_encoder_delayed_frames instead of the current hack to flush delayedreimar2009-09-231-4/+2
| | | | | | | | | | | | | | frames in VFCTRL_FLUSH_FRAMES. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29705 b3059339-0415-0410-9bf9-f77b7e298cf2
| * sync to x264-r1260 (which changed api)lorenm2009-09-231-33/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29704 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge branch 'vdpau' into buildUoti Urpala2009-09-192-11/+6
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * vdpau: (22 commits) VO: Prefer vo_vdpau over vo_xv again vo_vdpau: Fix X event handling bugs vo_vdpau: Fix memory corruption bug with MP_IMGTYPE_NUMBERED core/VO: Allow VO drivers to add/modify frames video_out.h: Cosmetics VO interface: Remove obsolete draw_frame() from new interface vo_vdpau: Support recovering from VDPAU display preemption vo_vdpau: Support updating OSD while paused vo_vdpau.c: Reindent control() switch statement vo_vdpau: Allocate one large surface for EOSD content vo_vdpau.c: cosmetics vo_vdpau: reindent after GUI code removal vo_vpdau: Clean up uninit logic vo_vdpau: Make CHECK_ST macro safer vo_vdpau: Move all remaining static/global variables to context vo_vdpau: Move things to context struct vo_vdpau: Make info struct const vo_vdpau: Replace global function table with context variable vo_vdpau: Move VDPAU interface pointers into one struct vo_vdpau: Add template file for VDPAU functions ...
| * | vo_vdpau: Fix memory corruption bug with MP_IMGTYPE_NUMBEREDUoti Urpala2009-09-181-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | The way vo_vdpau kept references to vf mpi objects was unsafe; with fixed-vo enabled the vf object could be destroyed and a new one created, but vo_vdpau would still keep the now stale references and modify memory through them to adjust usage counts. Send a VOCTRL_RESET from vf_vo uninit() to allow vo_vdpau to erase such references.
| * | core/VO: Allow VO drivers to add/modify framesUoti Urpala2009-09-182-11/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add interfaces to allow VO drivers to add or remove frames from the video stream and to alter timestamps. Currently this functionality only works with in correct-pts mode. Use the new functionality in vo_vdpau to properly support frame-adding deinterlace modes. Frames added by the VDPAU deinterlacing code are now properly timed. Before every second frame was always shown immediately (probably next monitor refresh) after the previous one, even if you were watching things in slow motion, and framestepping didn't stop at them at all. When seeking the deinterlace algorithm is no longer fed a mix of frames from old and new positions. As a side effect of the changes a problem with resize events was also fixed. Resizing calls video_to_output_surface() to render the frame at the new resolution, but before this function also changed the list of history frames, so resizing could give an image different from the original one, and also corrupt next frames due to them seeing the wrong history. Now the function has no such side effects. There are more resize-related problems though that will be fixed in a later commit. The deint_mpi[] list of reserved frames is increased from 2 to 3 entries for reasons related to the above. Having 2 entries is enough when you initially get a new frame in draw_image() because then you'll have those two entries plus the new one for a total of 3 (the code relied on the oldest mpi implicitly staying reserved for the duration of the call even after usage count was decreased). However if you want to be able to reproduce the rendering outside draw_image(), relying on the explicitly reserved list only, then it needs to store 3 entries.
* | | vf: Free MP_IMGTYPE_NUMBERED buffers tooUoti Urpala2009-09-181-0/+2
| | | | | | | | | | | | | | | When this newest type of buffers was added, needed code to free objects of this type when closing the filter had been omitted.
* | | Merge svn changes up to r29684Uoti Urpala2009-09-164-12/+31
|\ \ \ | | |/ | |/|
| * | Add several HAVE_EBX_AVAILABLE conditions where necessaryreimar2009-09-143-2/+10
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29681 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | %lf is not a valid printf format specifier, use just %f instead.reimar2009-09-141-1/+1
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29680 b3059339-0415-0410-9bf9-f77b7e298cf2
| * | Always keep a backup of the expand values from the command-line, so valuesreimar2009-09-101-8/+19
| | | | | | | | | | | | | | | | | | | | | | | | will be recalculated correctly e.g. after aspect change and -vf expand=aspect=4/3 command line. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29666 b3059339-0415-0410-9bf9-f77b7e298cf2
* | | Merge svn changes up to r29644Uoti Urpala2009-09-041-1/+4
|\| | | |/ |/|
| * Reindentreimar2009-08-261-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29554 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Retry deciding to get audio parameters several times on errors, this avoidsreimar2009-08-261-0/+3
| | | | | | | | | | | | | | failing to init the decoder completely just because the first packet is broken. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29553 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29544Uoti Urpala2009-08-222-15/+7
|\|
| * Fix incorrect channel ordering for lavc audio codecs (specifically ffac3,tack2009-08-182-15/+7
| | | | | | | | | | | | | | | | | | ffdca, ffflac, ffaac, fftruehd). In the process, adds support for 32-bit samples. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29533 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29532Uoti Urpala2009-08-185-7/+14
|\|
| * 100l, fix compilation again and make codec-cfg.c use the predefined constantsreimar2009-08-121-1/+1
| | | | | | | | | | | | | | instead of reimplementing the IMGFMT_RGB|bit_depth logic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29500 b3059339-0415-0410-9bf9-f77b7e298cf2
| * 1000l, RGB48BE does _not_ use 49 bit/pixel, probably fixes 48 bit PNG decoding.reimar2009-08-121-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29499 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add IMGFMT_RGB48LE and IMGFMT_RGB48BE.cehoyos2009-08-113-0/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29486 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add a giant hack to the x264 encoder module to ensure all delayed frames arereimar2009-08-071-1/+3
| | | | | | | | | | | | | | | | written on FLUSH_FRAMES, this is necessary since using multiple threads adds an additional delay beyond the B-frame delay. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29480 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace macro: MAX -> FFMAXben2009-08-061-6/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29479 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Change type names to match upstream libassGrigori Goronzy2009-08-072-9/+9
| |
* | Merge svn changes up to r29455Uoti Urpala2009-07-295-6/+6
|\|
| * Fix stupid, off-by-one, mistakes in assert() expressions.eugeni2009-07-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29448 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace WORDS_BIGENDIAN by HAVE_BIGENDIAN in all internal code.diego2009-07-265-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29443 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make sure clip coordinates are inside the screen area.eugeni2009-07-181-0/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29425 b3059339-0415-0410-9bf9-f77b7e298cf2
* | vf_pp: Remove deprecated "hex mode" supportUoti Urpala2009-07-261-32/+0
| | | | | | | | | | | | Remove code to support specifying arguments in hex form. This code depended on libpostproc internals, and has been deprecated and undocumented for years.
* | Remove internal libass treeUoti Urpala2009-07-262-6/+7
| | | | | | | | | | Remove the libass/ directory and use the newest standalone version of the library instead.
* | Use own mp_*_taglists code instead of libavformat internalsUoti Urpala2009-07-261-35/+2
| | | | | | | | | | Use the version of code under ffmpeg_files/ instead of relying on libavformat source files to be available.
* | Disable functionality requiring libswscale internalsUoti Urpala2009-07-261-0/+8
| | | | | | | | | | | | | | | | | | | | | | The following are affected: vo_yuv4mpeg, vf_halfpack, vf_palette, vf_rgb2bgr, vf_yuy2, vo_mga, vo_xmga. In vo_yuv4mpeg, only disable RGB support (which is probably little used). Others are disabled completely for now. vo_mga and vo_xmga are disabled by preventing configure from enabling them. The rest is placed under LIBSWSCALE_INTERNALS variable which isn't currently enabled anywhere.
* | Replace libavutil internal header #includes with MPlayer copiesUoti Urpala2009-07-265-5/+5
| | | | | | | | | | | | Change #include lines for libavutil/intreadwrite.h, libavutil/bswap.h and libavutil/x86_cpu.h to use the MPlayer file under ffmpeg_files/ instead.
* | Remove unnecessary libavutil/internal.h includesUoti Urpala2009-07-263-11/+0
| | | | | | | | | | | | | | These includes were added earlier after the definition of the DECLARE_ALIGNED and DECLARE_ASM_CONST macros were moved to this header in FFmpeg. However now those macros are again in the public mem.h header, and there is no need to include internal.h.
* | Merge svn changes up to r29417Uoti Urpala2009-07-123-6/+415
|\|
| * 20% faster hqdn3d on x86_64lorenm2009-07-071-6/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29414 b3059339-0415-0410-9bf9-f77b7e298cf2
| * new debanding filterlorenm2009-07-072-0/+409
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29413 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29412Uoti Urpala2009-07-073-6/+11
|\|
| * replace "g" asm constraint by "erm" since "g" allows 64bit immediates whilegpoirier2009-06-071-2/+2
| | | | | | | | | | | | | | | | | | | | | | the operator (cmp) using the "g"-constrained operand doesn't support 64bit immediates. Original thread: date: Tue, Jun 2, 2009 at 11:31 AM subject: [PATCH] Fix MPlayer to compile on Darwin/x86_86 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29352 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Switch to avcodec_decode_video2 to allow a hack that makes PNG decode correctlyreimar2009-06-011-2/+7
| | | | | | | | | | | | | | again instead of in CorePNG delta mode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29340 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Initialize local variable, avoids a possible crash due to using anreimar2009-06-011-2/+2
| | | | | | | | | | | | | | uninitialized variable as array index for mono files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29339 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-13128-1289/+1289
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-07127-1308/+1260
| |
* | Merge svn changes up to r29304Uoti Urpala2009-07-071-0/+2
|\|
| * MPV_common_init balks if s->avctx->pix_fmt == PIX_FMT_NONE, so we set it ↵rik2009-05-091-0/+2
| | | | | | | | | | | | correctly git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29286 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-0734-118/+277
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-0734-119/+119
| | | | | | | | | | Replace mp_msg() calls which have a translated string as the format argument with mp_tmsg and add _() around all other translated strings.
* | Merge svn changes up to r29277Uoti Urpala2009-05-088-17/+16
|\|
| * Add missing 'void' to parameterless function declarations.diego2009-05-042-10/+10
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29254 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Replace glibc-specific __WORDSIZE preprocessor check with HAVE_FAST_64BIT.diego2009-04-251-2/+2
| | | | | | | | | | | | | | The latter is properly set by configure. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29237 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove reference to outdated documentation file.diego2009-04-202-2/+0