| Muxer.cpp (ssr-0.3.10) | : | Muxer.cpp (ssr-0.3.11) |
|---|
| | |
| skipping to change at line 316 | | skipping to change at line 316 |
|---|
| if(avcodec_get_context_defaults3(*codec_context, codec) < 0) { | | if(avcodec_get_context_defaults3(*codec_context, codec) < 0) { |
| Logger::LogError("[Muxer::AddStream] " + Logger::tr("Error: Can't
get codec context defaults!")); | | Logger::LogError("[Muxer::AddStream] " + Logger::tr("Error: Can't
get codec context defaults!")); |
| throw LibavException(); | | throw LibavException(); |
| } | | } |
| (*codec_context)->codec_id = codec->id; | | (*codec_context)->codec_id = codec->id; |
| (*codec_context)->codec_type = codec->type; | | (*codec_context)->codec_type = codec->type; |
| #endif | | #endif |
| | |
| // not sure why this is needed, but it's in the example code and it doesn
't work without this | | // not sure why this is needed, but it's in the example code and it doesn
't work without this |
| if(m_format_context->oformat->flags & AVFMT_GLOBALHEADER) | | if(m_format_context->oformat->flags & AVFMT_GLOBALHEADER) |
|
| (*codec_context)->flags |= CODEC_FLAG_GLOBAL_HEADER; | | (*codec_context)->flags |= AV_CODEC_FLAG_GLOBAL_HEADER; |
| | |
| // if the codec is experimental, allow it | | // if the codec is experimental, allow it |
|
| if(codec->capabilities & CODEC_CAP_EXPERIMENTAL) { | | if(codec->capabilities & AV_CODEC_CAP_EXPERIMENTAL) { |
| Logger::LogWarning("[Muxer::AddStream] " + Logger::tr("Warning: T
his codec is considered experimental by libav/ffmpeg.")); | | Logger::LogWarning("[Muxer::AddStream] " + Logger::tr("Warning: T
his codec is considered experimental by libav/ffmpeg.")); |
| (*codec_context)->strict_std_compliance = FF_COMPLIANCE_EXPERIMEN
TAL; | | (*codec_context)->strict_std_compliance = FF_COMPLIANCE_EXPERIMEN
TAL; |
| } | | } |
| | |
| #if SSR_USE_SIDE_DATA_ONLY_PACKETS && !SSR_USE_SIDE_DATA_ONLY_PACKETS_DEPRECATED | | #if SSR_USE_SIDE_DATA_ONLY_PACKETS && !SSR_USE_SIDE_DATA_ONLY_PACKETS_DEPRECATED |
| // this option was added with the intent to deprecate it again in the nex
t version, | | // this option was added with the intent to deprecate it again in the nex
t version, |
| // because the ffmpeg/libav devs like deprecating things :) | | // because the ffmpeg/libav devs like deprecating things :) |
| (*codec_context)->side_data_only_packets = 1; | | (*codec_context)->side_data_only_packets = 1; |
| #endif | | #endif |
| | |
| | | |
| End of changes. 2 change blocks. |
|---|
| 2 lines changed or deleted | | 2 lines changed or added |
|---|
"Fossies" - the Fresh Open Source Software Archive 