summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorcehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-02 10:47:40 +0000
committercehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-05-02 10:47:40 +0000
commit0fd8d985f0c0481b1ebf14cb735cec485bc66d0c (patch)
tree6ec2fe1b6133a444b649e6de46f328fdefe91b26 /libmpdemux
parentfa6239aea034da3fdc4be76007a8bc06daa1093b (diff)
downloadmpv-0fd8d985f0c0481b1ebf14cb735cec485bc66d0c.tar.bz2
mpv-0fd8d985f0c0481b1ebf14cb735cec485bc66d0c.tar.xz
Silence permanent warning messages when decoding H264 over rtsp with
live555. Patch by Gil Pedersen, gil A cmi D aau D dk git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31128 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_rtp_codec.cpp7
1 files changed, 6 insertions, 1 deletions
diff --git a/libmpdemux/demux_rtp_codec.cpp b/libmpdemux/demux_rtp_codec.cpp
index 36d770fd0d..7d168c541f 100644
--- a/libmpdemux/demux_rtp_codec.cpp
+++ b/libmpdemux/demux_rtp_codec.cpp
@@ -134,12 +134,17 @@ void rtpCodecInitialize_video(demuxer_t* demuxer,
unsigned char* configData
= parseH264ConfigStr(subsession->fmtp_spropparametersets(), configLen);
sh_video->bih = bih = insertVideoExtradata(bih, configData, configLen);
- delete[] configData;
#ifdef CONFIG_LIBAVCODEC
+ int fooLen;
+ const uint8_t* fooData;
avcodec_register_all();
h264parserctx = av_parser_init(CODEC_ID_H264);
avcctx = avcodec_alloc_context();
+ // 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) {
bih->biCompression = sh_video->format