aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCarl Eugen Hoyos <ceffmpeg@gmail.com>2020-05-21 22:03:08 +0200
committerCarl Eugen Hoyos <ceffmpeg@gmail.com>2020-08-25 19:29:34 +0200
commit09e260f69aec891860419d8bd9c0d0cbab9f2d40 (patch)
treeb93d42e35f8589e4f6eabba589717b1492d14d8a
parent68f637b6f94d25f45eee2e9320e0057a548b92e0 (diff)
downloadffmpeg-09e260f69aec891860419d8bd9c0d0cbab9f2d40.tar.gz
lavf/rtpdec_jpeg: Fix JFIF version.
See also b1931321
-rw-r--r--libavformat/rtpdec_jpeg.c2
-rw-r--r--libavformat/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c
index 931463cec4..b32d074136 100644
--- a/libavformat/rtpdec_jpeg.c
+++ b/libavformat/rtpdec_jpeg.c
@@ -112,7 +112,7 @@ static int jpeg_create_header(uint8_t *buf, int size, uint32_t type, uint32_t w,
jpeg_put_marker(&pbc, APP0);
bytestream2_put_be16(&pbc, 16);
bytestream2_put_buffer(&pbc, "JFIF", 5);
- bytestream2_put_be16(&pbc, 0x0201);
+ bytestream2_put_be16(&pbc, 0x0102);
bytestream2_put_byte(&pbc, 0);
bytestream2_put_be16(&pbc, 1);
bytestream2_put_be16(&pbc, 1);
diff --git a/libavformat/version.h b/libavformat/version.h
index aa309ecc77..88876aec79 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -33,7 +33,7 @@
// Also please add any ticket numbers that you believe might be affected here
#define LIBAVFORMAT_VERSION_MAJOR 58
#define LIBAVFORMAT_VERSION_MINOR 51
-#define LIBAVFORMAT_VERSION_MICRO 100
+#define LIBAVFORMAT_VERSION_MICRO 101
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \