diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-10-11 12:53:12 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-10-11 12:53:12 +0000 |
| commit | 79378eecf6e82b850f5f49695b92bd8bbca91166 (patch) | |
| tree | 439e6091df69559c5a790e23414624af917401ad /src/libffmpeg/xine_decoder.c | |
| parent | 3c4c48c7446323d5690f69eeed5cae5652b24b5d (diff) | |
| download | xine-lib-79378eecf6e82b850f5f49695b92bd8bbca91166.tar.gz xine-lib-79378eecf6e82b850f5f49695b92bd8bbca91166.tar.bz2 | |
Use av_parser to decode audio, should make MP3 playback saner. Don't override avcodec_register_all() function when using external FFmpeg.
CVS patchset: 8334
CVS date: 2006/10/11 12:53:12
Diffstat (limited to 'src/libffmpeg/xine_decoder.c')
| -rw-r--r-- | src/libffmpeg/xine_decoder.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/libffmpeg/xine_decoder.c b/src/libffmpeg/xine_decoder.c index 323ce4e3c..10f420997 100644 --- a/src/libffmpeg/xine_decoder.c +++ b/src/libffmpeg/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.170 2006/08/02 07:15:27 tmmm Exp $ + * $Id: xine_decoder.c,v 1.171 2006/10/11 12:53:12 dgp85 Exp $ * * xine decoder plugin using ffmpeg * @@ -38,6 +38,7 @@ pthread_once_t once_control = PTHREAD_ONCE_INIT; pthread_mutex_t ffmpeg_lock; +#ifndef HAVE_FFMPEG void avcodec_register_all(void) { static int inited = 0; @@ -146,6 +147,7 @@ void avcodec_register_all(void) register_avcodec(&truespeech_decoder); register_avcodec(&tta_decoder); } +#endif void init_once_routine(void) { pthread_mutex_init(&ffmpeg_lock, NULL); |