---
libavformat/rtpenc_jpeg.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavformat/rtpenc_jpeg.c b/libavformat/rtpenc_jpeg.c
index b8c880a..699f8c6 100644
--- a/libavformat/rtpenc_jpeg.c
+++ b/libavformat/rtpenc_jpeg.c
@@ -40,17 +40,17 @@ void ff_rtp_send_jpeg(AVFormatContext *s1, const uint8_t
*buf, int size)
s->timestamp = s->cur_timestamp;
/* convert video pixel dimensions from pixels to blocks */
- w = (s1->streams[0]->codec->width + 7) >> 3;
- h = (s1->streams[0]->codec->height + 7) >> 3;
+ w = s1->streams[0]->codecpar->width >> 3;
+ h = s1->streams[0]->codecpar->height >> 3;
/* get the pixel format type or fail */
- if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ422P ||
- (s1->streams[0]->codec->color_range == AVCOL_RANGE_JPEG &&
- s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUV422P)) {
+ if (s1->streams[0]->codecpar->format == AV_PIX_FMT_YUVJ422P ||
+ (s1->streams[0]->codecpar->color_range == AVCOL_RANGE_JPEG &&
+ s1->streams[0]->codecpar->format == AV_PIX_FMT_YUV422P)) {
type = 0;
- } else if (s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUVJ420P ||
- (s1->streams[0]->codec->color_range == AVCOL_RANGE_JPEG &&
- s1->streams[0]->codec->pix_fmt == AV_PIX_FMT_YUV420P)) {
+ } else if (s1->streams[0]->codecpar->format == AV_PIX_FMT_YUVJ420P ||
+ (s1->streams[0]->codecpar->color_range == AVCOL_RANGE_JPEG &&
+ s1->streams[0]->codecpar->format == AV_PIX_FMT_YUV420P)) {
type = 1;
} else {
av_log(s1, AV_LOG_ERROR, "Unsupported pixel format\n");
--
2.0.0
_______________________________________________
libav-devel mailing list
[email protected]
https://lists.libav.org/mailman/listinfo/libav-devel
