diff options
Diffstat (limited to 'libmpcodecs')
-rw-r--r-- | libmpcodecs/ad_ffmpeg.c | 3 | ||||
-rw-r--r-- | libmpcodecs/ad_qtaudio.c | 2 | ||||
-rw-r--r-- | libmpcodecs/dec_audio.c | 1 | ||||
-rw-r--r-- | libmpcodecs/dec_video.c | 1 | ||||
-rw-r--r-- | libmpcodecs/vf_divtc.c | 4 | ||||
-rw-r--r-- | libmpcodecs/vf_sab.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vf_zrmjpeg.c | 2 | ||||
-rw-r--r-- | libmpcodecs/vqf.h | 18 |
8 files changed, 16 insertions, 17 deletions
diff --git a/libmpcodecs/ad_ffmpeg.c b/libmpcodecs/ad_ffmpeg.c index 7ecbb20cb3..a07e88fd70 100644 --- a/libmpcodecs/ad_ffmpeg.c +++ b/libmpcodecs/ad_ffmpeg.c @@ -175,7 +175,8 @@ static int decode_audio(sh_audio_t *sh_audio,unsigned char *buf,int minlen,int m if (((AVCodecContext *)sh_audio->context)->channels >= 5) { int src_ch_layout = AF_CHANNEL_LAYOUT_MPLAYER_DEFAULT; const char *codec=((AVCodecContext*)sh_audio->context)->codec->name; - if (!strcasecmp(codec, "ac3")) + if (!strcasecmp(codec, "ac3") + || !strcasecmp(codec, "eac3")) src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_AC3_DEFAULT; else if (!strcasecmp(codec, "dca")) src_ch_layout = AF_CHANNEL_LAYOUT_LAVC_DCA_DEFAULT; diff --git a/libmpcodecs/ad_qtaudio.c b/libmpcodecs/ad_qtaudio.c index 2fa71c6548..6feeee25b3 100644 --- a/libmpcodecs/ad_qtaudio.c +++ b/libmpcodecs/ad_qtaudio.c @@ -81,7 +81,7 @@ HMODULE WINAPI LoadLibraryA(LPCSTR); FARPROC WINAPI GetProcAddress(HMODULE,LPCSTR); int WINAPI FreeLibrary(HMODULE); -static int loader_init() +static int loader_init(void) { #ifdef WIN32_LOADER diff --git a/libmpcodecs/dec_audio.c b/libmpcodecs/dec_audio.c index a15640c552..d73b381906 100644 --- a/libmpcodecs/dec_audio.c +++ b/libmpcodecs/dec_audio.c @@ -270,7 +270,6 @@ int init_best_audio_codec(sh_audio_t *sh_audio, char **audio_codec_list, if (!sh_audio->initialized) { mp_msg(MSGT_DECAUDIO, MSGL_ERR, MSGTR_CantFindAudioCodec, sh_audio->format); - mp_msg(MSGT_DECAUDIO, MSGL_HINT, MSGTR_RTFMCodecs); return 0; // failed } diff --git a/libmpcodecs/dec_video.c b/libmpcodecs/dec_video.c index 95297b2117..ce85c28460 100644 --- a/libmpcodecs/dec_video.c +++ b/libmpcodecs/dec_video.c @@ -364,7 +364,6 @@ int init_best_video_codec(sh_video_t *sh_video, char **video_codec_list, if (!sh_video->initialized) { mp_msg(MSGT_DECVIDEO, MSGL_ERR, MSGTR_CantFindVideoCodec, sh_video->format); - mp_msg(MSGT_DECAUDIO, MSGL_HINT, MSGTR_RTFMCodecs); return 0; // failed } diff --git a/libmpcodecs/vf_divtc.c b/libmpcodecs/vf_divtc.c index baaeb3ef57..b9326e6d8a 100644 --- a/libmpcodecs/vf_divtc.c +++ b/libmpcodecs/vf_divtc.c @@ -128,7 +128,7 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z, unsigned int shift; uint32_t sum, t; unsigned char *e, *e2; -#if __WORDSIZE==64 +#if HAVE_FAST_64BIT typedef uint64_t wsum_t; #else typedef uint32_t wsum_t; @@ -143,7 +143,7 @@ static unsigned int checksum_plane(unsigned char *p, unsigned char *z, for(wsum=0, e2=e-sizeof(wsum_t)+1; p<e2; p+=sizeof(wsum_t)) wsum^=*(wsum_t *)p; -#if __WORDSIZE==64 +#if HAVE_FAST_64BIT t=be2me_32((uint32_t)(wsum>>32^wsum)); #else t=be2me_32(wsum); diff --git a/libmpcodecs/vf_sab.c b/libmpcodecs/vf_sab.c index 5a0ce4e48f..be1b8db515 100644 --- a/libmpcodecs/vf_sab.c +++ b/libmpcodecs/vf_sab.c @@ -102,7 +102,7 @@ static int allocStuff(FilterParam *f, int width, int height){ swsF.lumH= swsF.lumV= vec; swsF.chrH= swsF.chrV= NULL; f->preFilterContext= sws_getContext( - width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, get_sws_cpuflags(), &swsF, NULL, NULL); + width, height, PIX_FMT_GRAY8, width, height, PIX_FMT_GRAY8, get_sws_cpuflags()|SWS_POINT, &swsF, NULL, NULL); sws_freeVec(vec); vec = sws_getGaussianVec(f->strength, 5.0); diff --git a/libmpcodecs/vf_zrmjpeg.c b/libmpcodecs/vf_zrmjpeg.c index 32b4f9b7bc..48b954ea80 100644 --- a/libmpcodecs/vf_zrmjpeg.c +++ b/libmpcodecs/vf_zrmjpeg.c @@ -620,7 +620,7 @@ static int jpeg_enc_frame(jpeg_enc_t *j, uint8_t *y_data, //if (j->s->mjpeg_write_tables == 1) // j->s->mjpeg_write_tables = 0; - return pbBufPtr(&(j->s->pb)) - j->s->pb.buf; + return put_bits_ptr(&(j->s->pb)) - j->s->pb.buf; } /// the real uninit routine diff --git a/libmpcodecs/vqf.h b/libmpcodecs/vqf.h index 85691f5568..118f7ea06f 100644 --- a/libmpcodecs/vqf.h +++ b/libmpcodecs/vqf.h @@ -193,7 +193,7 @@ typedef struct { //DllPort int TvqInitialize( headerInfo *setupInfo, INDEX *index, int dispErrorMessageBox ); //DllPort void TvqTerminate( INDEX *index ); //DllPort void TvqGetVectorInfo(int *bits0[], int *bits1[]); -//DllPort void TvqResetFrameCounter(); +//DllPort void TvqResetFrameCounter(void); // TwinVQ decoder function //DllPort void TvqDecodeFrame(INDEX *indexp, float out[]); @@ -205,19 +205,19 @@ typedef struct { //DllPort int TvqCheckVersion(char *versionID); //DllPort void TvqGetSetupInfo(headerInfo *setupInfo); // setup information //DllPort void TvqGetConfInfo(tvqConfInfo *cf); // configuration information -//DllPort int TvqGetFrameSize(); // frame size -//DllPort int TvqGetNumChannels(); // number of channels -//DllPort int TvqGetBitRate(); // total bitrate -//DllPort float TvqGetSamplingRate(); // sampling rate -//DllPort int TvqGetNumFixedBitsPerFrame(); // number of fixed bits per frame -//DllPort int TvqGetNumFrames(); // number of decoded frame +//DllPort int TvqGetFrameSize(void); // frame size +//DllPort int TvqGetNumChannels(void); // number of channels +//DllPort int TvqGetBitRate(void); // total bitrate +//DllPort float TvqGetSamplingRate(void); // sampling rate +//DllPort int TvqGetNumFixedBitsPerFrame(void); // number of fixed bits per frame +//DllPort int TvqGetNumFrames(void); // number of decoded frame //DllPort int TvqGetModuleVersion( char* versionString ); #ifdef V2PLUS_SUPPORT // TwinVQ FB coding tool control DllPort void TvqFbCountUsedBits(int nbit); // count number of used bits -DllPort float TvqGetFbCurrentBitrate(); // query average bitrate for the tool -DllPort int TvqGetFbTotalBits(); // query total number of used bits +DllPort float TvqGetFbCurrentBitrate(void); // query average bitrate for the tool +DllPort int TvqGetFbTotalBits(void); // query total number of used bits #endif #ifdef __cplusplus |