diff options
author | Uoti Urpala <uau@mplayer2.org> | 2011-12-11 07:48:26 +0200 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-12-11 07:48:26 +0200 |
commit | 2e1cdcb9e6263a7ca16151713338176ef7b1ee06 (patch) | |
tree | f90c2ac5f9642183106114a81bfb6c979622ea1f /libmpdemux/demux_rtp_codec.cpp | |
parent | fc2d040b2248adaac816b999a90ad452ee1f2be6 (diff) | |
download | mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.bz2 mpv-2e1cdcb9e6263a7ca16151713338176ef7b1ee06.tar.xz |
configure, build: remove --disable-libav support
Remove support for building the player without libavcodec and
libavformat. These libraries are now always required.
Diffstat (limited to 'libmpdemux/demux_rtp_codec.cpp')
-rw-r--r-- | libmpdemux/demux_rtp_codec.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp index 68b1964c0c..28fb51e96e 100644 --- a/libmpdemux/demux_rtp_codec.cpp +++ b/libmpdemux/demux_rtp_codec.cpp @@ -27,10 +27,8 @@ extern "C" { #include "libavutil/base64.h" } -#ifdef CONFIG_FFMPEG AVCodecParserContext * h264parserctx; AVCodecContext *avcctx; -#endif // Copied from vlc static unsigned char* parseH264ConfigStr( char const* configStr, @@ -134,7 +132,6 @@ void rtpCodecInitialize_video(demuxer_t* demuxer, unsigned char* configData = parseH264ConfigStr(subsession->fmtp_spropparametersets(), configLen); sh_video->bih = bih = insertVideoExtradata(bih, configData, configLen); -#ifdef CONFIG_FFMPEG int fooLen; const uint8_t* fooData; h264parserctx = av_parser_init(CODEC_ID_H264); @@ -142,7 +139,6 @@ void rtpCodecInitialize_video(demuxer_t* demuxer, // Pass the config to the parser h264parserctx->parser->parser_parse(h264parserctx, avcctx, &fooData, &fooLen, configData, configLen); -#endif delete[] configData; needVideoFrameRate(demuxer, subsession); } else if (strcmp(subsession->codecName(), "H261") == 0) { |