Skip to content

Commit

Permalink
Back out the weak linkage to libavformat
Browse files Browse the repository at this point in the history
This causes build issues on both Windows and OS X.  It's not worth a slightly
"easier" build on Linux if it breaks our other two platforms completely.

Patch from #9468
  • Loading branch information
jyavenard committed Jan 29, 2011
1 parent 0b3cf3f commit 904648b
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 12 deletions.
1 change: 1 addition & 0 deletions mythtv/libs/libmyth/libmyth.pro
Expand Up @@ -87,6 +87,7 @@ LIBS += -L../libmythfreesurround -lmythfreesurround-$${LIBVERSION}
LIBS += -L../../external/FFmpeg/libavcodec -lmythavcodec
LIBS += -L../../external/FFmpeg/libavcore -lmythavcodec
LIBS += -L../../external/FFmpeg/libavutil -lmythavutil
LIBS += -L../../external/FFmpeg/libavformat -lmythavformat

TARGETDEPS += ../libmythsamplerate/libmythsamplerate-$${MYTH_LIB_EXT}
TARGETDEPS += ../libmythsoundtouch/libmythsoundtouch-$${MYTH_LIB_EXT}
Expand Down
12 changes: 0 additions & 12 deletions mythtv/libs/libmyth/spdifencoder.h
Expand Up @@ -11,18 +11,6 @@ extern "C" {
#include "libavcodec/audioconvert.h"
}

#pragma weak av_register_all
#pragma weak av_guess_format
#pragma weak avformat_alloc_context
#pragma weak av_new_stream
#pragma weak av_write_header
#pragma weak av_write_frame
#pragma weak av_write_trailer
#pragma weak avcodec_close
#pragma weak av_freep
#pragma weak av_set_parameters
#pragma weak av_alloc_put_byte

class MPUBLIC SPDIFEncoder
{
public:
Expand Down

0 comments on commit 904648b

Please sign in to comment.