summaryrefslogtreecommitdiffstats
path: root/libmpcodecs/ad_ffmpeg.c
Commit message (Collapse)AuthorAgeFilesLines
* Make audio decoder description structs constUoti Urpala2008-04-261-1/+1
| | | | | | Make the per-decoder struct ad_functions and its ->info struct constants. Same for the mpcodecs_ad_drivers[] table of pointers to those structs.
* Fix ffvorbis decoder's output channel order with channel reordering function.ulion2008-03-051-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@26164 b3059339-0415-0410-9bf9-f77b7e298cf2
* FFmpeg now uses different (unified) #include paths.diego2008-02-251-5/+1
| | | | 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
* Fix all current known multi-channel wrong order problems by addingulion2007-12-101-0/+20
| | | | | | | | | | | common functions for channel reordering. This fixes these modules by adding channel reordering code for 5.0/5.1 audio: ao: pcm ad: dmo, faad, ffmpeg(ac3, dca, libfaad, liba52), pcm ae: faac, lavc(ac3, libfaac), pcm git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@25343 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set sample_rate and bit_rate from sh_audio as fallback in case sh_audio->wfreimar2007-08-271-0/+2
| | | | | | | is not available. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24246 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use new request_channelsreimar2007-08-231-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24128 b3059339-0415-0410-9bf9-f77b7e298cf2
* Revert setting audio output channel count for FFmpeguau2007-08-021-2/+0
| | | | | | | | | | | | | | | | | | | | The FFmpeg API needs to be fixed before this can be done sanely. ffdca wants the desired output channel count to be set in avctx->channels. Unfortunately it also completely fails if the requested number of channels is not available rather than returning a different amount (if 6 channels are requested we'd probably rather use stereo than fail completely). ffvorbis ignores caller-set values in avctx->channels. It writes the channel count there once during init. This means the caller can only set the count before init because later there would be no indication whether the channel count in avctx reflects real output. ffwma requires the caller to supply the encoded channel count in avctx->channels during init or it fails. So it is not possible to set a different number of desired output channels there before init either. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23998 b3059339-0415-0410-9bf9-f77b7e298cf2
* Set lavc_context->channels before opening the codec, it is sufficient toreimar2007-08-011-2/+2
| | | | | | | | select the desired number of codecs for ffdca and does not break other codecs like ffvorbis that do not (re)set the channel number during decode. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23994 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move extern int audio_output_channels; to ad_internal.hreimar2007-07-301-1/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23938 b3059339-0415-0410-9bf9-f77b7e298cf2
* Indicate desired number of output channels to ffmpeg audio decoder.reimar2007-07-301-0/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23937 b3059339-0415-0410-9bf9-f77b7e298cf2
* Use avcodec_decode_audio2 in ad_ffmpeg.creimar2007-06-051-2/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@23474 b3059339-0415-0410-9bf9-f77b7e298cf2
* Hack around libavutil/bswap.h compilation problems due to always_inline ↵reimar2006-12-071-1/+1
| | | | | | undefined. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21523 b3059339-0415-0410-9bf9-f77b7e298cf2
* Remove bswap.h, use libavutil/bswap.h instead.diego2006-11-291-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21388 b3059339-0415-0410-9bf9-f77b7e298cf2
* Do not use sh_audio->wf values if they are definitely invalidreimar2006-10-211-0/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@20334 b3059339-0415-0410-9bf9-f77b7e298cf2
* 4 - Implement a better way to calculate current audio pts and use it forrtognimp2006-04-241-1/+7
| | | | | | | | | audio decoded with ad_libvorbis, ad_ffmpeg and ad_faad. Patch by Uoti Urpala git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18243 b3059339-0415-0410-9bf9-f77b7e298cf2
* Using channel count, samplerate and input bps values from the containerdiego2006-04-191-1/+2
| | | | | | | | | | | instead of the decoder breaks some DTS samples where the container says the audio has 6 channels but the decoder gives 2. In this case take the number of channels from the decoder instead, the output will almost certainly be badly garbled anyway if the number of channels is wrong. patch by Uoti Urpala, uoti <<.>> urpala <<@>> pp1 <<.>> inet <<.>> fi git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18151 b3059339-0415-0410-9bf9-f77b7e298cf2
* Trust the demuxer instead of the decoder for samplerate detection.diego2006-03-301-6/+5
| | | | | | | | Fixes the ffmp3_bad_rate_detection.avi sample. patch by qwen dux qwendu__at__gmail__.__com git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17996 b3059339-0415-0410-9bf9-f77b7e298cf2
* Move conditional compilation out of the code and into the build system.diego2006-01-311-6/+0
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17524 b3059339-0415-0410-9bf9-f77b7e298cf2
* malloc padding to avoid access beyond allocated memoryhenry2005-12-191-1/+1
| | | | | | | Credits to Mikulas Patocka (mikulas at artax karlin mff cuni cz) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@17227 b3059339-0415-0410-9bf9-f77b7e298cf2
* Support new static libavcodec (depends on libavutil).al2005-08-011-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@16166 b3059339-0415-0410-9bf9-f77b7e298cf2
* alac support via lavc decoderrtognimp2005-03-061-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14923 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass wave extradata to the codec..alex2005-02-011-0/+9
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14634 b3059339-0415-0410-9bf9-f77b7e298cf2
* change malloc and free to av_ variants where needed.reimar2005-01-081-4/+3
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14432 b3059339-0415-0410-9bf9-f77b7e298cf2
* setting samplesize to 2 in decoders where neccessary.reimar2004-09-211-0/+1
| | | | | | | | Needed because initialization of sh_audio was moved from dec_audio to demuxer.c, and some demuxers set samplesize incorrect or to 0. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@13428 b3059339-0415-0410-9bf9-f77b7e298cf2
* inttypesalex2004-04-061-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@12143 b3059339-0415-0410-9bf9-f77b7e298cf2
* flushing stuff after seeking (finally we can view MPEG without thouse blocks ↵michael2004-02-181-2/+8
| | | | | | after seeking with -vc ffmpeg12) git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11978 b3059339-0415-0410-9bf9-f77b7e298cf2
* merging fourcc with codec_tagmichael2003-03-081-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@9548 b3059339-0415-0410-9bf9-f77b7e298cf2
* ffmp2 (with mpeg files) sig11 fixedarpi2002-12-281-6/+8
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8591 b3059339-0415-0410-9bf9-f77b7e298cf2
* Fix stereo MACE filesrtognimp2002-11-041-2/+2
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8109 b3059339-0415-0410-9bf9-f77b7e298cf2
* MACE fixarpi2002-11-041-0/+12
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8102 b3059339-0415-0410-9bf9-f77b7e298cf2
* 10l - fixed wma version misdetectionalex2002-10-291-0/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7959 b3059339-0415-0410-9bf9-f77b7e298cf2
* pass extradata to the codecarpi2002-10-281-5/+24
| | | | | | | patch by Fabrice Bellard <fabrice.bellard@free.fr> git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7941 b3059339-0415-0410-9bf9-f77b7e298cf2
* -afm/-vfm help implemenetd, some cosmetics of ad/vd codec names/commentsarpi2002-08-311-1/+1
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7192 b3059339-0415-0410-9bf9-f77b7e298cf2
* -afm/-vfm migration from ID (int) to NAME (string) - simplifies code and ↵arpi2002-08-301-1/+0
| | | | | | makes dlopen()'ing possible git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7181 b3059339-0415-0410-9bf9-f77b7e298cf2
* dynamic libavcodec.so support updated byarpi2002-08-141-1/+1
| | | | | | | Alexander.Gottwald@informatik.tu-chemnitz.de git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7005 b3059339-0415-0410-9bf9-f77b7e298cf2
* removed useless contect struct -> code simplifiedarpi2002-04-031-28/+14
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5481 b3059339-0415-0410-9bf9-f77b7e298cf2
* using sh->contextalex2002-04-011-14/+41
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5448 b3059339-0415-0410-9bf9-f77b7e298cf2
* argh... Nick messed up driver names tooarpi2002-03-251-0/+4
| | | | git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5344 b3059339-0415-0410-9bf9-f77b7e298cf2
* imported from MPlayerXP, dlopen() hack removed, some bugs fixed, interface ↵arpi2002-03-251-0/+106
functions changed to static, info->author field added git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5341 b3059339-0415-0410-9bf9-f77b7e298cf2