hydrar/mistserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed MistInAV - now compiles if -DWITH_AV=1 is set

Browse source
This commit is contained in:
Thulinma 2016-09-03 14:44:42 +02:00
parent 1172768c34
commit ba7467979a
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -317,6 +317,10 @@ makeInput(DTSC dtsc)
makeInput(DTSCCrypt dtsccrypt) makeInput(DTSCCrypt dtsccrypt)
makeInput(MP3 mp3) makeInput(MP3 mp3)
makeInput(FLV flv) makeInput(FLV flv)
if (DEFINED WITH_AV )
makeInput(AV av)
target_link_libraries(MistInAV avformat avcodec avutil)
endif()
makeInput(OGG ogg) makeInput(OGG ogg)
makeInput(Buffer buffer) makeInput(Buffer buffer)
makeInput(ISMV ismv)#LTS makeInput(ISMV ismv)#LTS

4
src/input/input_av.cpp
View file

@ -237,11 +237,11 @@ namespace Mist {
pkt["offset"] = (long long)((packet.pts - packet.dts) * 1000 * strm->time_base.num / strm->time_base.den); pkt["offset"] = (long long)((packet.pts - packet.dts) * 1000 * strm->time_base.num / strm->time_base.den);
} }
pkt.netPrepare(); pkt.netPrepare();
lastPack.reInit(pkt.toNetPacked().data(), pkt.toNetPacked().size()); thisPacket.reInit(pkt.toNetPacked().data(), pkt.toNetPacked().size());
av_free_packet(&packet); av_free_packet(&packet);
return;//success! return;//success!
} }
lastPack.null(); thisPacket.null();
setup(); setup();
//failure :-( //failure :-(
DEBUG_MSG(DLVL_FAIL, "getNext failed"); DEBUG_MSG(DLVL_FAIL, "getNext failed");