Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-06-20 04:14:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #94 from AsamK/correct_libav_version

Browse source 
Fix libav version check
This commit is contained in:
Cyril Soler 2015-09-07 20:36:03 -04:00
commit 63e38af19c
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
plugins/VOIP/gui/VideoProcessor.cpp
View file

@ -325,7 +325,7 @@ FFmpegVideo::FFmpegVideo()
//AVCodecID codec_id = AV_CODEC_ID_H264 ; //AVCodecID codec_id = AV_CODEC_ID_H264 ;
//AVCodecID codec_id = AV_CODEC_ID_MPEG2VIDEO; //AVCodecID codec_id = AV_CODEC_ID_MPEG2VIDEO;
#if LIBAVCODEC_VERSION_MAJOR < 55 #if LIBAVCODEC_VERSION_MAJOR < 54
CodecID codec_id = CODEC_ID_MPEG4; CodecID codec_id = CODEC_ID_MPEG4;
#else #else
AVCodecID codec_id = AV_CODEC_ID_MPEG4; AVCodecID codec_id = AV_CODEC_ID_MPEG4;
@ -387,7 +387,7 @@ FFmpegVideo::FFmpegVideo()
*/ */
encoding_context->gop_size = 100; encoding_context->gop_size = 100;
//encoding_context->max_b_frames = 1; //encoding_context->max_b_frames = 1;
#if LIBAVCODEC_VERSION_MAJOR < 55 #if LIBAVCODEC_VERSION_MAJOR < 54
encoding_context->pix_fmt = PIX_FMT_YUV420P; //context->pix_fmt = PIX_FMT_RGB24; encoding_context->pix_fmt = PIX_FMT_YUV420P; //context->pix_fmt = PIX_FMT_RGB24;
if (codec_id == CODEC_ID_H264) { if (codec_id == CODEC_ID_H264) {
#else #else
@ -435,7 +435,7 @@ FFmpegVideo::FFmpegVideo()
decoding_context->width = encoding_context->width; decoding_context->width = encoding_context->width;
decoding_context->height = encoding_context->height; decoding_context->height = encoding_context->height;
#if LIBAVCODEC_VERSION_MAJOR < 55 #if LIBAVCODEC_VERSION_MAJOR < 54
decoding_context->pix_fmt = PIX_FMT_YUV420P; decoding_context->pix_fmt = PIX_FMT_YUV420P;
#else #else
decoding_context->pix_fmt = AV_PIX_FMT_YUV420P; decoding_context->pix_fmt = AV_PIX_FMT_YUV420P;