summaryrefslogtreecommitdiffstats
path: root/libmpcodecs
Commit message (Collapse)AuthorAgeFilesLines
* libaf: add opts pointer to struct af_streamUoti Urpala2010-11-021-2/+2
|
* ad_libdca: fix assert failure on -channels >6Uoti Urpala2010-11-021-3/+10
| | | | | | | The decoder had an assert from back when max channels was 6, causing a crash if the user specified -channels 7 or -channels 8. Change the decoder to behave as if -channels 6 had been specified in that case instead.
* options: move audio_output_channels, audio_output_format to structUoti Urpala2010-11-027-15/+22
|
* build: enable/disable all FFmpeg libraries togetherUoti Urpala2010-11-023-7/+5
| | | | | | | | | Enable all of libavcodec, libavformat, libswscale, and libpostproc together (libavutil is always required). based on svn commit by diego: git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32226 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove MEncoderUoti Urpala2010-11-0227-8065/+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.
* cosmetics: Remove vim/emacs coding style hints from sourcesdiego2010-11-022-5/+0
| | | | | | The hints are inconsistent and pointless if only present in a few files. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32223 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_sab, vf_smartblur: add "const" to match swscale APIdiego2010-11-022-2/+2
| | | | | | | | Mark srcArray as const pointer to const data, fixes the warnings: libmpcodecs/vf_sab.c:183: warning: passing argument 2 of 'sws_scale' from incompatible pointer type libmpcodecs/vf_smartblur.c:134: warning: passing argument 2 of 'sws_scale' from incompatible pointer type git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32220 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: malloc+memset->calloc, sizeof(TYPE)->sizeof(*ptr)reimar2010-11-0211-39/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* cosmetics: reformat vf_ass to K&R styleUoti Urpala2010-11-021-289/+318
|
* enable vo_mga, vo_xmga, vf_palette, vf_halfpackUoti Urpala2010-11-021-4/+0
| | | | | | Nothing should depend on libswscale internals any more, so re-enable everything. vf_palette and vf_halfpack were actually fixed earlier but were not properly enabled.
* vf_fixpts: Mark vf_info_t declaration constdiego2010-11-021-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32118 b3059339-0415-0410-9bf9-f77b7e298cf2
* cosmetics: remove "_s" prefix from "struct vf_info_s"Uoti Urpala2010-11-021-1/+1
|
* cosmetics: Remove commented-out mpcodecs_ad_null leftoversdiego2010-11-021-2/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32058 b3059339-0415-0410-9bf9-f77b7e298cf2
* Add central init_avcodec() to avoid duplicated libavcodec init codediego2010-11-0211-57/+54
| | | | | | | | | | | | | | | | 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
* vd_ffmpeg: Set avctx->coded_width/coded_height instead of width/heightreimar2010-11-021-2/+2
| | | | | | That's how it is supposed to be done. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32037 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_ffmpeg, vd_ffmpeg: remove pointless castsdiego2010-11-022-2/+2
| | | | | | | | Remove pointless casts of avcodec_find_decoder_by_name() return value. avcodec_find_decoder_by_name() already returns AVCodec*, so there is no need to cast the return value to this type. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32007 b3059339-0415-0410-9bf9-f77b7e298cf2
* spelling fixessiretart2010-11-021-2/+2
| | | | | | | | | | Found by the Debian QA tool 'lintian' git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31913 b3059339-0415-0410-9bf9-f77b7e298cf2 reintroduce typo in genres.h that was fixed fixed r31913 to match the id3v2 spec git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31920 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_qtvideo: Some indentation fixesreimar2010-11-021-7/+7
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31785 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_qtvideo: generate a ImageDescription if not givenreimar2010-11-021-5/+20
| | | | | | | | Generate a ImageDescription if none is passed neither via ImageDesc nor extradata. Makes the ProRes decoder work with -demuxer lavf. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31784 b3059339-0415-0410-9bf9-f77b7e298cf2
* audio: support parameter changes (e.g. channel count) during playbackreimar2010-11-022-25/+61
| | | | | | | | | | | | | | | | | Add support for parameter changes (e.g. channel count) during playback. This makes decoding AC3 files that switch between 2 and 6 channels work reasonably well even with -channels 6 and ffac3 decoder. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31737 b3059339-0415-0410-9bf9-f77b7e298cf2 Fix typo in error message: ACC -> AAC git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32473 b3059339-0415-0410-9bf9-f77b7e298cf2 Avoid printing AAC with SBR warning on every decode call, instead print it only after every decoder reconfiguration. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@32476 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_mpeg123: Enable robust resyncdiego2010-11-021-0/+3
| | | | | | | | | This prevents the decoder from giving up give after long pieces of invalid data, for example during transmission errors with DVB-T and similar. patch by Thomas Orgis, thomas-forum orgis org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31732 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use AV_RL* macros instead of typecasts where appropriatereimar2010-11-025-27/+21
| | | | | | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31680 b3059339-0415-0410-9bf9-f77b7e298cf2 100l compialtion fix and use AV_RB32. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31683 b3059339-0415-0410-9bf9-f77b7e298cf2 Current FFmpeg installs intreadwrite.h, but keep using the internal version for now to keep the possibility of compiling against older FFmpeg lib versions.
* libgsm: Remove libgsm wrapperreimar2010-11-025-1214/+0
| | | | | | | | | | Remove copy of old and ugly libgsm code and wrapper. Decoding these formats is supported via FFmpeg both natively and through libgsm. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31657 b3059339-0415-0410-9bf9-f77b7e298cf2 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31664 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_xanim.c: Give functions proper prototypesreimar2010-11-021-24/+45
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31611 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_geq: Fix function prototypes to match the required type.reimar2010-11-021-3/+3
| | | | | | Fixes "initialization from incompatible pointer type" warnings. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31609 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: Add const qualifiers for struct ad_functions pointersreimar2010-11-021-1/+1
| | | | | | | The ad_functions structs are in rodata, mark some pointers to them const. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31606 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_faad: fix compilation using external libfaadattila2010-11-021-0/+11
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31603 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_mpg123: add MP3 decoding through libmpg123diego2010-11-022-0/+580
| | | | | | patch by Thomas Orgis, thomas-forum orgis org git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31590 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: add av_unused attribute to swap_palette()diego2010-11-021-1/+1
| | | | | | Only used on bigendian machines. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31586 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_ffmpeg: make VP8 decoder work by disabling drreimar2010-11-021-1/+1
| | | | | | | Allow the FFmpeg VP8 decoder to work by disabling dr for it (thus we do not need edge emulation). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31560 b3059339-0415-0410-9bf9-f77b7e298cf2
* ad_faad: Improve LATM recognitioncehoyos2010-11-021-2/+24
| | | | | | Patch by Dan Oscarsson, Dan d Oscarsson a tieto d com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31543 b3059339-0415-0410-9bf9-f77b7e298cf2
* cleanup: #include loader/wine/winbase.h instead of local declarationsdiego2010-11-023-10/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31414 b3059339-0415-0410-9bf9-f77b7e298cf2
* vf_rgb2bgr: remove the filtersiretart2010-11-022-125/+0
| | | | | | | | | | Its functionality has been superseeded by sws by quite some time, and the "swap" functionality is now provided by vf_format. see http://comments.gmane.org/gmane.comp.video.mplayer.devel/55804 for a full discussion. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31350 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: Minor code simplification.reimar2010-10-271-1/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31336 b3059339-0415-0410-9bf9-f77b7e298cf2
* vd_ffmpeg: fix aspect ratio problems with recent FFmpegUoti Urpala2010-10-161-0/+2
| | | | | | | | | | The code left ctx->last_sample_aspect_ratio at 0/0 when allocating a context. In older FFmpeg versions av_cmp_q() against 0/0 always said the numbers are equal; but this changed recently, triggering incorrect overwrite of container aspect ratio. The logic looks like it'd need further fixes, but for now just initialize last_sample_aspect_ratio to 0/1; this should restore the previous behavior from before FFmpeg changes, which worked well enough for the most common cases.
* vd_ffmpeg: fix calloc/av_free mixupUoti Urpala2010-10-161-7/+4
| | | | | | avctx->palctrl was allocated with calloc() but freed with av_freep(). Free it with free() instead. Also change the main decoder context allocation to use talloc.
* Merge svn changes up to r31332Uoti Urpala2010-06-052-2/+18
|\
| * Extend -vf format to allow substituting the format for a compatible onereimar2010-06-051-2/+16
| | | | | | | | | | | | | | (e.g. chaning rgb24 to bgr24). git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31331 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix -vf format and -vf noformat to work with slices.reimar2010-06-052-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31330 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes r31318 to r31328Uoti Urpala2010-06-052-5/+5
|\| | | | | | | | | r31328 is a somewhat questionable (changing the option at that point isn't quite safe), but it was a failure case already...
| * Fix compilation after FFmpeg r23485.cehoyos2010-06-052-5/+5
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31322 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Limit buffered PTS only when we actually got a frame from the decoder.reimar2010-06-031-14/+17
| | | | | | | | | | | | | | | | | | | | This avoids some issues with H.264 PAFF due to dropping PTS values too early because only every second packet actually produced output. Just keeping up to one additional pts value would have avoided this particular issue as well, but this is more generic. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31312 b3059339-0415-0410-9bf9-f77b7e298cf2
| * ass_set_aspect_ratio() takes three arguments since 0x00907010.cehoyos2010-06-022-2/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31304 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31303Uoti Urpala2010-06-023-24/+33
|\|
| * avoid using swscale internals by copying in palette8torbg16 and its bgr variantsiretart2010-06-011-1/+18
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31303 b3059339-0415-0410-9bf9-f77b7e298cf2
| * deprecate palette8topacked32 in favor of public API functions ↵siretart2010-06-011-8/+9
| | | | | | | | | | | | | | | | | | | | | | | | sws_convertPalette8ToPacked32 and -24 additionallym deprecate palette8torgb16 and its bgr variant without replacement. These functions are not meant to be used by applications. Discussed at: http://comments.gmane.org/gmane.comp.video.ffmpeg.devel/109340 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31301 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Fix compilation after FFmpeg r23402.cehoyos2010-06-012-5/+6
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31299 b3059339-0415-0410-9bf9-f77b7e298cf2
| * remove palette8torgb15 and palette8tobgr15siretart2010-06-011-10/+0
| | | | | | | | | | | | | | | | | | They contain exactly the same code as their 16bit variants, so this is effectively code de-duplication. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31298 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Forgotten part of previous commit (extern declaration of drc_level).reimar2010-05-301-0/+2
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31287 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Use the -a52drc option also for the libavcodec decoder.reimar2010-05-303-6/+7
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31286 b3059339-0415-0410-9bf9-f77b7e298cf2
* | ad_ffmpeg: set lavc drc_scale parameter according to opts->drc_levelUoti Urpala2010-06-021-0/+3
| |
* | options: move -a52drc to option structUoti Urpala2010-06-021-9/+8
| | | | | | | | Also allow a range up to 2.
* | Merge svn changes up to r31265Uoti Urpala2010-06-021-1/+1
|\|
| * cosmetics: Remove some commented-out #includes, fix a comment grammar error.diego2010-05-291-4/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31260 b3059339-0415-0410-9bf9-f77b7e298cf2
| * Directly mark jpeg_buf_src() as void instead of using some indirection marcro.diego2010-05-291-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31259 b3059339-0415-0410-9bf9-f77b7e298cf2
* | Merge svn changes up to r31256Uoti Urpala2010-05-301-3/+3
|\|
| * Use MSGT_DECVIDEO in a video decoder.cehoyos2010-05-281-3/+3
| | | | | | | | | | | | | | Patch by Giorgio Vazzana, mywing81 gmail git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31249 b3059339-0415-0410-9bf9-f77b7e298cf2
| * cosmetics: Drop pointless _s suffix from 'struct ad_functions'.diego2010-05-271-1/+1
| | | | | | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31231 b3059339-0415-0410-9bf9-f77b7e298cf2
| *