summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ve_lavc.c
Commit message (Collapse)AuthorAgeFilesLines
* Remove MEncoderUoti Urpala2010-11-021-1050/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Disable MEncoder compilation and remove files used by MEncoder only. There's no attempt to remove all references to MEncoder from the build system, documentation etc at this point. Removed files: (muxers, audio/video encoders, misc) mencoder.c cfg-mencoder.h parser-mecmd.[ch] xvid_vbr.[ch] libmpdemux/muxer* libmpcodecs/ae* libmpcodecs/ve* libmpcodecs/native/rtjpegn.[ch] libmpcodecs/native/mmx.h // was used by rtjpegn only Rationale: MEncoder is still useful for some people, but there's not much potential for further development; in the long run almost all use cases can be handled better by solutions based on something else (for example using FFmpeg or encoding MPlayer output). FFmpeg is already getting video filtering support which should work for some common MEncoder uses. Keeping MEncoder working takes extra work that is away from player development. While that amount of work is not huge (mostly MEncoder can be just ignored), it's not completely insignificant either. MEncoder is still maintained to some degree in the svn tree, so if necessary it's possible to use it from there for now. This tree has never had major improvements for the MEncoder side, so using svn MEncoder instead should be no major loss.
* cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)reimar2010-11-021-14/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32181 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32182 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32183 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace some sizeof(type) by sizeof(*pointer) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32184 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32186 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32187 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32188 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizoef(type) by sizeof(*ptrvar). Besides being consistent with FFmpeg style, this reduces the size of a patch to rename these types to not conflict with the windows.h definitions. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32189 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32191 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32192 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(type) by sizeof(*ptrvar) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32193 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a useless cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32194 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(type) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32195 b3059339-0415-0410-9bf9-f77b7e298cf2 Remove a useless cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32196 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace several sizeof(WAVEFORMATEX) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32197 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace one more instance of sizeof(WAVEFORMATEX); fix compilation. patch by Clément Bœsch, ubitux gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32199 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid some pointless uses of sizeof() and one related cast. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32200 b3059339-0415-0410-9bf9-f77b7e298cf2 Merge one malloc() + memset() invocation into calloc(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32202 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32203 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(WAVEFORMATEX) occurrences. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32205 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace malloc+memset by calloc. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32206 b3059339-0415-0410-9bf9-f77b7e298cf2 Replace sizeof(BITMAPINFOHEADER) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32207 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add central init_avcodec() to avoid duplicated libavcodec init codediego2010-11-021-6/+2
| | | | | | | | | | | | | | | | Patch by Vlad Seryakov, vseryakov gmail com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32043 b3059339-0415-0410-9bf9-f77b7e298cf2 Refactor more instances of avcodec_initialized handling into init_avcodec(). This is a leftover from the previous commit. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32044 b3059339-0415-0410-9bf9-f77b7e298cf2 Add missing #include for vd_ffmpeg.h; fixes the warning: libmpcodecs/vf_zrmjpeg.c:472: warning: implicit declaration of function 'init_avcodec' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32176 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: "struct vf_instance* vf" -> "struct vf_instance *vf"Uoti Urpala2010-05-291-7/+7
| | | | | | | Change 'struct vf_instance' pointer arguments to more standard style as in the subject. Also some other minor formatting fixes. Patch by Diego Biurrun.
* Merge svn changes up to r31004Uoti Urpala2010-04-261-3/+1
|\
| * Mark encoder-related m_option_t struct arrays as const.diego2010-04-041-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30997 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Remove pointless #ifdef CONFIG_LIBAVCODEC preprocessor check.diego2010-04-031-2/+0
| | | | | | | | | | | | | | The file is only compiled if that condition is true. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30990 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Rename struct vf_instance_s --> vf_instance.diego2010-02-211-7/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30684 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Delete things related to old translation systemUoti Urpala2010-03-101-1/+0
| | | | | | | | | | Remove the help/ subdirectory, configure code to create toplevel help_mp.h, and all the '#include "help_mp.h"' lines from .c files.
* | Merge svn changes up to r30463Uoti Urpala2010-03-091-0/+18
|\| | | | | | | | | | | Note that r30455 is wrong, that commit does not in fact change the default behavior as claimed in the commit message. It only breaks "-af-adv force=0", which was already pretty much useless though.
| * Add missing license headers to all files in the libmpcodecs directory.diego2010-01-301-0/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30463 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r30375Uoti Urpala2010-01-251-24/+5
|\|
| * Add a proper header for our strsep implementation so strsep willreimar2010-01-171-0/+1
| | | | | | | | | | | | | | not be used without a declaration, causing issues on 64 bit systems. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30355 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Reuse the fmt-conversion code instead of duplicating the functionality.reimar2010-01-171-24/+4
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30354 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29912Uoti Urpala2009-11-161-1/+2
|\|
| * Only call avcodec_close if the open succeeded before, otherwise avcodec_closereimar2009-11-061-1/+2
| | | | | | | | | | | | | | | | will crash (happens e.g. when encoding ends before any frames were actually encoded, e.g. when an MPEG file was cut down to much so it no longer contains a full video frame). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29835 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r29752Uoti Urpala2009-10-061-1/+3
|\| | | | | | | | | | | | | | | | | 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.
| * 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-251-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29715 b3059339-0415-0410-9bf9-f77b7e298cf2
| * whitespace cosmetics: Remove all trailing whitespace.diego2009-05-131-28/+28
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@29305 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Remove trailing whitespace from most filesUoti Urpala2009-07-071-28/+28
| |
* | Translation system changes part 2: replace macros by stringsAmar Takhar2009-07-071-4/+4
| | | | | | | | | | Replace all MSGTR_ macros in the source by the corresponding English string.
* | Translation system changes part 1: wrap translated stringsAmar Takhar2009-07-071-4/+4
| | | | | | | | | | 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 r28461Uoti Urpala2009-02-041-0/+5
|\|
| * Add support for libavcodec GMC flag, patch by Dave Baker, dbkr mxtelecom com.diego2009-02-011-0/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28415 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r28403Uoti Urpala2009-01-311-2/+2
|\|
| * Update libavcodec 'aic' flag define to match current FFmpeg.diego2009-01-301-2/+2
| | | | | | | | | | | | | | patch by Dave Baker, dbkr mxtelecom com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28395 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r27573Uoti Urpala2008-09-101-6/+5
|\| | | | | | | | | Conflicts: libmpcodecs/vd_ffmpeg.c
| * Fix compilation after libavcodec major version 52 changesuau2008-09-081-6/+5
| | | | | | | | | | | | | | | | | | | | | | Some symbols were dropped or renamed, requiring corresponding changes in MPlayer. - Use AVCodecContext->bits_per_coded_sample instead of ->bits_per_sample. - Use AVCodecContext->trellis instead of ->flags&CODEC_FLAG_TRELLIS_QUANT. - Don't set AVCodecContext->rtp_mode (already marked unused before). - Use ff_eval2() instead of ff_eval(). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27548 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
* | Merge svn changes up to r27347Uoti Urpala2008-07-251-0/+4
|\| | | | | | | | | | | | | | | | | | | | | Conflicts: libvo/x11_common.c libvo/x11_common.h Rename the vo_gl macro "vo_border()" to "vo_gl_border" as it conflicts with the global variable "vo_border"; done in the merge commit because uses of the macro needed changes anyway to resolve conflicts.
| * Add Dirac video support via libdirac and libschroedinger in libavcodec.diego2008-07-221-0/+4
| | | | | | | | | | | | | | patch by Anuradha Suraparaju, anuradha rd.bbc.co uk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27339 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26979Uoti Urpala2008-06-041-1/+1
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26786 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r26783Uoti Urpala2008-05-151-0/+10
|\| | | | | | | | | | | | | | | | | | | | | | | Conflicts: Makefile common.mak configure libmpcodecs/vd_ffmpeg.c libmpdemux/demux_mkv.c libvo/vo_xv.c mplayer.c
| * 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
* | Remove _s/_st suffix from some struct namesUoti Urpala2008-04-251-7/+7
|/ | | | | Since the names are always used after the keyword "struct" having a suffix as in "struct demuxer_st" is almost completely pointless.
* Restore grayscale decoding support with FFmpeg.diego2008-04-131-0/+3
| | | | | | | Removing support was done due to a silly misunderstanding. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26427 b3059339-0415-0410-9bf9-f77b7e298cf2
* Grayscale encoding/decoding with FFmpeg is no longer enabled, remove referencesdiego2008-03-071-3/+0
| | | | | | | from the documentation and the relevant options from the glue code. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26198 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-4/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26101 b3059339-0415-0410-9bf9-f77b7e298cf2
* typo fix: inited --> initializeddiego2008-02-141-3/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support lowdelay flagreimar2007-09-061-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24349 b3059339-0415-0410-9bf9-f77b7e298cf2
* make x264 work again after the h264-libx264 renamingmichael2007-08-071-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24024 b3059339-0415-0410-9bf9-f77b7e298cf2
* allow to specify the audio bitrate in bits (some codecs need that ...)michael2007-07-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23977 b3059339-0415-0410-9bf9-f77b7e298cf2
* make timestamps out of hot airmichael2007-07-311-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23974 b3059339-0415-0410-9bf9-f77b7e298cf2
* make a few more parameters accessable from mplayermichael2007-07-311-1/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23973 b3059339-0415-0410-9bf9-f77b7e298cf2
* Pass imgfmt from lavc encoder to lavf muxer (this is needed for dv).corey2007-05-171-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23327 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add DV fourcc.corey2007-05-131-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23306 b3059339-0415-0410-9bf9-f77b7e298cf2
* add "level" as lavc optioncehoyos2007-05-031-0/+3
| | | | | | | | | | | Patch by Gustavo Sverzut Barbieri, barbieri ! gmail x com reference: Subject: [MPlayer-dev-eng] [PATCH] add "level" as option to lavc (aka Mencoder generating PS3 playable h264 videos) Date: 2007-05-03 13:56 +200 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23227 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
| | | | | | | Now for the encoding-related files as well. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22618 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix compilation after deprecation of some lav log level andreimar2007-02-071-1/+1
| | | | | | | pixel format stuff. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@22170 b3059339-0415-0410-9bf9-f77b7e298cf2
* support lavc mblmin and mblmaxcorey2006-11-081