diff --git a/contrib/src/ffmpeg/rules.mak b/contrib/src/ffmpeg/rules.mak
index fc8edde375058a7d800497e8c2ccb722919621ff..d5b61f8074a9397dec660599a06501498cf381ca 100644
--- a/contrib/src/ffmpeg/rules.mak
+++ b/contrib/src/ffmpeg/rules.mak
@@ -54,6 +54,7 @@ FFMPEGCONF += \
 		--enable-encoder=libvpx_vp8 \
 		--enable-decoder=vp8 \
 		--enable-encoder=h263 \
+		--enable-encoder=h263p \
 		--enable-decoder=h263 \
 		--enable-encoder=mjpeg \
 		--enable-decoder=mjpeg \
diff --git a/contrib/src/libav/rules.mak b/contrib/src/libav/rules.mak
index e0287ed5497820f0f25076b2e848ad2df1e3867c..38580cb686ef41e2f3c169144529f61c4ba9793b 100644
--- a/contrib/src/libav/rules.mak
+++ b/contrib/src/libav/rules.mak
@@ -52,6 +52,7 @@ LIBAVCONF += \
 		--enable-decoder=mpeg4 \
 		--enable-encoder=h263 \
 		--enable-decoder=h263 \
+		--enable-encoder=h263p \
 		--enable-encoder=libspeex \
 		--enable-decoder=libspeex
 
diff --git a/src/media/media_codec.cpp b/src/media/media_codec.cpp
index b1939b204c34a76aaccdfb28ead5380b2a7df54c..5e98b1c997d34ad388c4ed82ce442781c0e57c5f 100644
--- a/src/media/media_codec.cpp
+++ b/src/media/media_codec.cpp
@@ -134,6 +134,8 @@ AccountCodecInfo::AccountCodecInfo(const SystemCodecInfo& sysCodecInfo)
 {
     if (sysCodecInfo.minQuality != SystemCodecInfo::DEFAULT_NO_QUALITY)
         quality = SystemCodecInfo::DEFAULT_CODEC_QUALITY;
+    else
+        quality = SystemCodecInfo::DEFAULT_NO_QUALITY;
 }
 
 AccountCodecInfo::~AccountCodecInfo()
diff --git a/src/media/media_encoder.cpp b/src/media/media_encoder.cpp
index ea93b19bf9d8324e15371fa92a7165ea2d4bb31b..7819d74528aa8ee64d31ee676ff69f8c196e6733 100644
--- a/src/media/media_encoder.cpp
+++ b/src/media/media_encoder.cpp
@@ -134,7 +134,13 @@ MediaEncoder::openOutput(const char *filename,
     outputCtx_->filename[sizeof(outputCtx_->filename) - 1] = '\0';
 
     /* find the video encoder */
-    outputEncoder_ = avcodec_find_encoder((AVCodecID)args.codec->systemCodecInfo.avcodecId);
+    if (args.codec->systemCodecInfo.avcodecId == AV_CODEC_ID_H263)
+        // For H263 encoding, we force the use of AV_CODEC_ID_H263P (H263-1998)
+        // H263-1998 can manage all frame sizes while H263 don't
+        // AV_CODEC_ID_H263 decoder will be used for decoding
+        outputEncoder_ = avcodec_find_encoder(AV_CODEC_ID_H263P);
+    else
+        outputEncoder_ = avcodec_find_encoder((AVCodecID)args.codec->systemCodecInfo.avcodecId);
     if (!outputEncoder_) {
         RING_ERR("Encoder \"%s\" not found!", args.codec->systemCodecInfo.name.c_str());
         throw MediaEncoderException("No output encoder");
@@ -192,6 +198,14 @@ MediaEncoder::openOutput(const char *filename,
         encoderCtx_->rc_buffer_size = maxBitrate;
         encoderCtx_->bit_rate = encoderCtx_->rc_min_rate = encoderCtx_->rc_max_rate =  maxBitrate;
         RING_DBG("Using Max bitrate %d", maxBitrate);
+    } else if (args.codec->systemCodecInfo.avcodecId == AV_CODEC_ID_H263) {
+        encoderCtx_->bit_rate = encoderCtx_->rc_max_rate =  maxBitrate;
+        encoderCtx_->rc_buffer_size = maxBitrate;
+        // on libav there are video artifcats if multithreading is enabled
+        // see https://bugzilla.libav.org/show_bug.cgi?id=912
+        // TODO: this is a workaround !
+        encoderCtx_->thread_count = 1;
+        RING_DBG("Using Max bitrate %d", maxBitrate);
     }
 
     int ret;
diff --git a/src/media/system_codec_container.cpp b/src/media/system_codec_container.cpp
index ec23e5d92b261408cd93d253fbff801ab146efdb..30b52ed5d8adc9c957d5a0562cddad8887b02285 100644
--- a/src/media/system_codec_container.cpp
+++ b/src/media/system_codec_container.cpp
@@ -75,7 +75,7 @@ SystemCodecContainer::initCodecConfig()
                                                DEFAULT_VIDEO_BITRATE),
 
         std::make_shared<SystemVideoCodecInfo>(AV_CODEC_ID_H263,
-                                               "H263", "h263",
+                                               "H263-1998", "h263",
                                                CODEC_ENCODER_DECODER,
                                                DEFAULT_VIDEO_BITRATE),
 #endif