summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* Merge svn changes up to r30876Uoti Urpala2010-03-104-7/+146
|\
| * Fix QuickTime emulated OSErr type.sesse2010-03-062-7/+7
| | | | | | | | | | | | | | | | | | | | | | | | The OSErr type on Mac OS X is int16_t, not int32_t (see http://developer.apple.com/mac/library/documentation/QuickTime/Reference/QTRef_DataTypes/Reference/reference.html). The upper 16 bits will typically be something random (they're entirely undefined). Change the type so it's right; a few places tried to compensate for this by masking out the upper bits, but a few places also missed them, which made for unpredictable behavior. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30854 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Enable ASS/SSA subtitle support in mencodergreg2010-03-052-0/+139
| | | | | | | | | | | | | | | | | | | | | | Enable ASS/SSA rendering through libass in mencoder. This duplicates a bit of code (to parse font attachments, for example). Additionally, add a filter "fixpts" that generates PTS, simulating fixed fps. PTS generated by this filter are then used for subtitle timing. Original patch by Nicolas George. (nicolas.george normalesup.org) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30849 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30848Uoti Urpala2010-03-102-2/+6
|\|
| * Partially revert r30645, the final output format is determined byreimar2010-03-032-2/+6
| | | | | | | | | | | | | | | | | | | | mpcodecs_config_vo so we need to query it afterwards. Still try to set a more sensible, codec-dependant preferred format even though it is currently ignored. Fixes bug #1659, based on patch by Andrew Wason [rectalogic rectalogic com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30824 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30798Uoti Urpala2010-03-104-61/+59
|\|
| * Reuse the keyframe flag from x264 instead of trying to derive it on our own.reimar2010-02-281-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30790 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the KEYFRAME define instead of some magic number.reimar2010-02-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30789 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Get rid of many ugly casts.cehoyos2010-02-281-39/+38
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30786 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make close_toolame() static, only used in ae_toolame.c.cehoyos2010-02-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30785 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make close_twolame() static, only used in ae_twolame.c.cehoyos2010-02-281-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30783 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Actually use existing uninit() function in remove_logo filter.cehoyos2010-02-271-18/+20
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30778 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make function Gsm_Long_Term_Synthesis_Filtering() static, only used in xa_gsm.c.cehoyos2010-02-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30772 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark all fmt_list arrays as const.diego2010-02-264-4/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30750 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark vf_opts/vf_opts_fields structures as const.diego2010-02-264-8/+8
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30749 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30748Uoti Urpala2010-03-109-11/+11
|\|
| * Do not cast the results of malloc/calloc/realloc.diego2010-02-269-11/+11
| | | | | | | | | | | | | | | | These functions return void*, which is compatible with any pointer, so there is no need for casts. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30744 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add const to mpvdec declarationreimar2010-02-252-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30734 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30732Uoti Urpala2010-03-101-1/+1
|\|
| * Fix check for wrong variable: len can be unitialized but not normally < 0,reimar2010-02-251-1/+1
| | | | | | | | | | | | | | the return value needs to be checked to detect an error. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30732 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark member info of struct ad_functions_s as const.diego2010-02-221-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30705 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark a bunch of video filter structures as const.diego2010-02-224-14/+14
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30704 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove commented-out cruft line.diego2010-02-221-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30703 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Declare externally used variables from vd.c as extern in vd.h.diego2010-02-226-16/+12
| | | | | | | | | | | | | | This saves declaring them as extern all over the place. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30695 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename struct vf_instance_s --> vf_instance.diego2010-02-2187-383/+383
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30683Uoti Urpala2010-03-1080-160/+162
|\|
| * Rename open() vf initialization function to vf_open().diego2010-02-2179-158/+157
| | | | | | | | | | | | | | This avoids clashes with fcntl.h under certain circumstances. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30680 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add malloc.h #include for memalign(), fixes the warning:diego2010-02-211-2/+5
| | | | | | | | | | | | | | libmpcodecs/vd_dmo.c:81: warning: implicit declaration of function 'memalign' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30678 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark ad_functions_t structures and mpcodecs_ad_drivers array as const.diego2010-02-203-29/+29
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30676 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove pointless empty lines at EOF.diego2010-02-2030-48/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30675 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30663Uoti Urpala2010-03-105-18/+57
|\| | | | | | | | | | | | | Conflicts: gui/cfg.c libmpcodecs/vd_dmo.c mplayer.c
| * Fix the stack crash(SYS3171) on OS/2 when playing qtaudio/qtvideo.komh2010-02-192-0/+13
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30656 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Remove commented-out #include.diego2010-02-191-1/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30653 b3059339-0415-0410-9bf9-f77b7e298cf2
| * DirectShow requires stride to be a multiple of 4 for RGB24/BGR24, addreimar2010-02-181-10/+39
| | | | | | | | | | | | | | a special case to the DMO decoder to handle this. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30648 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Merge declaration and initialization.reimar2010-02-182-4/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30647 b3059339-0415-0410-9bf9-f77b7e298cf2
| * DShow and DMO decoders need MP_IMGFLAG_COMMON_PLANEreimar2010-02-182-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30646 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Call mpcodecs_config_vo with the proper image format for dmo and dshow codecs.reimar2010-02-182-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30645 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30643Uoti Urpala2010-03-109-25/+16
|\|
| * Add header for AVI print functions; avoids many forward declarations.diego2010-02-183-7/+3
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30631 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Handle negative height in draw_slice from FFmpeg in vd_ffmpeg.c, since atreimar2010-02-171-1/+13
| | | | | | | | | | | | | | | | | | | | least vo_xv and vo_sdl can not handle it and the scale filter seems to work fine either way. The FFmpeg vp3/Theora decoder produces such slices. Fixes bug #1646. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30630 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libmpcodecs: Remove pointless leftover '#if 1' preprocessor instructions.diego2010-02-176-17/+0
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30608 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert marking seemingly unused XAnim-binary-related functions as static.diego2010-02-171-12/+28
| | | | | | | | | | | | | | The functions are required to load binary XAnim codecs, so they need to be kept. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30607 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Revert marking seemingly unused RealAudio/RealVideo-related functions as static.diego2010-02-172-26/+31
| | | | | | | | | | | | | | | | | | The functions are required to load binary Real codecs, so they need to be kept. Group all functions together in ad_realaud.c because all the functions are used to load audio binaries and only some to load video binaries. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30606 b3059339-0415-0410-9bf9-f77b7e298cf2
| * libmpcodecs: Mark functions not used outside of their files as static.diego2010-02-167-32/+41
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30597 b3059339-0415-0410-9bf9-f77b7e298cf2
| * #include corresponding .h files in .c files.diego2010-02-161-0/+1
| | | | | | | | | | | | | | This ensures that function declarations in both files always match. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30596 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30595Uoti Urpala2010-03-096-11/+72
|\| | | | | | | | | | | Conflicts: mplayer.c vidix/nvidia_vid.c
| * Add header for init_global_rawdv_decoder() instead of forward declaring it.diego2010-02-163-3/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30595 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add header file for mplayer_audio_read() instead of forward declaring it.diego2010-02-162-0/+25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30594 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Add support for decoding 4:2:2 and 4:4:4 Theora files.reimar2010-02-141-8/+19
| | | | | | | | | | | | | | Patch by Giorgio Vazzana [mywing81 gmail com] git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30585 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Move movie_aspect extern declaration to libmpcodecs/vd.h.diego2010-02-141-0/+1
| | | | | | | | | | | | | | | | This is the appropriate place for the declaration; the variable is declared in libmpcodecs/vd.c. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30579 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30570Uoti Urpala2010-03-091-56/+32
|\|
| * Reindentreimar2010-02-141-26/+25
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30569 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Just use goto instead of reimplementing it badly with a do { } while (0) andreimar2010-02-141-21/+8
| | | | | | | | | | | | | | break. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30568 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Change aspect calculation code to switch to floating point earlier so integerreimar2010-02-141-2/+2
| | | | | | | | | | | | | | overflows are not possible. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30567 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Return NULL instead of 0 for function returning a pointer.reimar2010-02-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30565 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Mark uninit() as static; it is only used within the file.diego2010-02-141-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30564 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless casts.reimar2010-02-141-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30563 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove useless code, QUERY_FORMAT already ensures the requested format is ↵reimar2010-02-141-10/+0
| | | | | | | | | | | | supported. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30562 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make vd_functions_t describing codecs const.reimar2010-02-142-23/+23
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30561 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Make vd_info_t const for pointer in vd_functions, avoids some warnings aboutreimar2010-02-141-1/+1
| | | | | | | | | | | | | | initialization discarding the const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30559 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30557Uoti Urpala2010-03-092-2/+2
|\|
| * Remove excessive ()reimar2010-02-141-1/+1
| | | | | | | |