[FFmpeg-cvslog] Merge commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5'
James Almer
git at videolan.org
Sat Oct 21 21:10:52 EEST 2017
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sat Oct 21 14:57:53 2017 -0300| [69b5ce64d2260b01e28feb81527ad282bfcdf43b] | committer: James Almer
Merge commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5'
* commit '07a2b155949eb267cdfc7805f42c7b3375f9c7c5':
Bump major versions of all libraries
A few API deprecated ~2 years ago or more are also postponed here for
varying reasons.
FF_API_LOWRES:
Since this functionality depends on AVStream->codec, i figure the two can
be removed at the same time in the next bump or so.
FF_API_AVCTX_TIMEBASE:
Couldn't get this one to work. Not just libavcodec but apparently also
libavformat and ffmpeg.c expect AVCodecContext->time_base to be set for
decoding. Upon removal some tests report a different generic stream time
base (like 1/25), and others lose packet duration values. I guess it's
somehow tied to the AVStream->codec clusterfuck.
It can be dealt with alongside FF_API_LAVF_AVCTX in the next bump.
FF_API_OLD_FILTER_OPTS_ERROR:
This one is meant to remain after FF_API_OLD_FILTER_OPTS is removed.
Its purpose is displaying the corrected command line using the new syntax
as a suggestion as part of the error message.
Merged-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=69b5ce64d2260b01e28feb81527ad282bfcdf43b
---
libavcodec/version.h | 20 ++++++++---------
libavdevice/version.h | 6 +++---
libavfilter/version.h | 8 +++----
libavformat/version.h | 20 ++++++++---------
libavresample/version.h | 4 ++--
libavutil/version.h | 16 +++++++-------
libpostproc/version.h | 4 ++--
libswresample/version.h | 4 ++--
libswscale/version.h | 4 ++--
tests/ref/fate/api-mjpeg-codec-param | 42 ------------------------------------
tests/ref/fate/api-png-codec-param | 42 ------------------------------------
11 files changed, 43 insertions(+), 127 deletions(-)
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 1a513f2e72..9f1543a6aa 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -27,9 +27,9 @@
#include "libavutil/version.h"
-#define LIBAVCODEC_VERSION_MAJOR 57
-#define LIBAVCODEC_VERSION_MINOR 108
-#define LIBAVCODEC_VERSION_MICRO 101
+#define LIBAVCODEC_VERSION_MAJOR 58
+#define LIBAVCODEC_VERSION_MINOR 0
+#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@ -64,7 +64,7 @@
#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_LOWRES
-#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 58)
+#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_CAP_VDPAU
#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
@@ -161,25 +161,25 @@
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_MPV_OPT
-#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
+#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_STREAM_CODEC_TAG
-#define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 59)
+#define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_QUANT_BIAS
-#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 59)
+#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_RC_STRATEGY
-#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59)
+#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_CODED_FRAME
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_MOTION_EST
-#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59)
+#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_WITHOUT_PREFIX
-#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59)
+#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_SIDEDATA_ONLY_PKT
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
diff --git a/libavdevice/version.h b/libavdevice/version.h
index 68defac417..364404d65e 100644
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@ -27,9 +27,9 @@
#include "libavutil/version.h"
-#define LIBAVDEVICE_VERSION_MAJOR 57
-#define LIBAVDEVICE_VERSION_MINOR 11
-#define LIBAVDEVICE_VERSION_MICRO 101
+#define LIBAVDEVICE_VERSION_MAJOR 58
+#define LIBAVDEVICE_VERSION_MINOR 0
+#define LIBAVDEVICE_VERSION_MICRO 100
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
LIBAVDEVICE_VERSION_MINOR, \
diff --git a/libavfilter/version.h b/libavfilter/version.h
index 788d0a72d5..a350f47686 100644
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@ -29,8 +29,8 @@
#include "libavutil/version.h"
-#define LIBAVFILTER_VERSION_MAJOR 6
-#define LIBAVFILTER_VERSION_MINOR 108
+#define LIBAVFILTER_VERSION_MAJOR 7
+#define LIBAVFILTER_VERSION_MINOR 0
#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
@@ -53,7 +53,7 @@
#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
#ifndef FF_API_OLD_FILTER_OPTS_ERROR
-#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 7)
+#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
#ifndef FF_API_AVFILTER_OPEN
#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 7)
@@ -68,7 +68,7 @@
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
#ifndef FF_API_LAVR_OPTS
-#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 7)
+#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8)
#endif
#endif /* AVFILTER_VERSION_H */
diff --git a/libavformat/version.h b/libavformat/version.h
index 22f82a37f7..ed0439a26a 100644
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@ -31,9 +31,9 @@
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
// Also please add any ticket numbers that you believe might be affected here
-#define LIBAVFORMAT_VERSION_MAJOR 57
-#define LIBAVFORMAT_VERSION_MINOR 84
-#define LIBAVFORMAT_VERSION_MICRO 101
+#define LIBAVFORMAT_VERSION_MAJOR 58
+#define LIBAVFORMAT_VERSION_MINOR 0
+#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
@@ -71,31 +71,31 @@
#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_COMPUTE_PKT_FIELDS2
-#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_OLD_OPEN_CALLBACKS
-#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_LAVF_AVCTX
-#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_NOCONST_GET_SIDE_DATA
#define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_HTTP_USER_AGENT
-#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_HLS_WRAP
-#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_LAVF_MERGE_SD
#define FF_API_LAVF_MERGE_SD (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_LAVF_KEEPSIDE_FLAG
-#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_OLD_ROTATE_API
-#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 58)
+#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
diff --git a/libavresample/version.h b/libavresample/version.h
index e8f43ee0ff..d5d3ea82b1 100644
--- a/libavresample/version.h
+++ b/libavresample/version.h
@@ -27,8 +27,8 @@
#include "libavutil/version.h"
-#define LIBAVRESAMPLE_VERSION_MAJOR 3
-#define LIBAVRESAMPLE_VERSION_MINOR 8
+#define LIBAVRESAMPLE_VERSION_MAJOR 4
+#define LIBAVRESAMPLE_VERSION_MINOR 0
#define LIBAVRESAMPLE_VERSION_MICRO 0
#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \
diff --git a/libavutil/version.h b/libavutil/version.h
index bf5ea15abe..e9b8d0c37d 100644
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@ -79,8 +79,8 @@
*/
-#define LIBAVUTIL_VERSION_MAJOR 55
-#define LIBAVUTIL_VERSION_MINOR 79
+#define LIBAVUTIL_VERSION_MAJOR 56
+#define LIBAVUTIL_VERSION_MINOR 0
#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
@@ -119,25 +119,25 @@
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_VAAPI
-#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_FRAME_QP
-#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_PLUS1_MINUS1
-#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_ERROR_FRAME
-#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_CRC_BIG_TABLE
#define FF_API_CRC_BIG_TABLE (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_PKT_PTS
-#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_CRYPTO_SIZE_T
-#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 56)
+#define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
diff --git a/libpostproc/version.h b/libpostproc/version.h
index a8f2fa4ea8..3ae75ff8b0 100644
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@ -28,8 +28,8 @@
#include "libavutil/avutil.h"
-#define LIBPOSTPROC_VERSION_MAJOR 54
-#define LIBPOSTPROC_VERSION_MINOR 8
+#define LIBPOSTPROC_VERSION_MAJOR 55
+#define LIBPOSTPROC_VERSION_MINOR 0
#define LIBPOSTPROC_VERSION_MICRO 100
#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
diff --git a/libswresample/version.h b/libswresample/version.h
index 46424ae28a..54dfd71e42 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -28,8 +28,8 @@
#include "libavutil/avutil.h"
-#define LIBSWRESAMPLE_VERSION_MAJOR 2
-#define LIBSWRESAMPLE_VERSION_MINOR 10
+#define LIBSWRESAMPLE_VERSION_MAJOR 3
+#define LIBSWRESAMPLE_VERSION_MINOR 0
#define LIBSWRESAMPLE_VERSION_MICRO 100
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
diff --git a/libswscale/version.h b/libswscale/version.h
index 23d5b0c4e9..9c24122031 100644
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@ -26,8 +26,8 @@
#include "libavutil/version.h"
-#define LIBSWSCALE_VERSION_MAJOR 4
-#define LIBSWSCALE_VERSION_MINOR 9
+#define LIBSWSCALE_VERSION_MAJOR 5
+#define LIBSWSCALE_VERSION_MINOR 0
#define LIBSWSCALE_VERSION_MICRO 100
#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
diff --git a/tests/ref/fate/api-mjpeg-codec-param b/tests/ref/fate/api-mjpeg-codec-param
index 02f656df25..178b7c73cb 100644
--- a/tests/ref/fate/api-mjpeg-codec-param
+++ b/tests/ref/fate/api-mjpeg-codec-param
@@ -3,7 +3,6 @@ stream=0, decode=0
ab=0
bt=4000000
flags=0x00000000
- me_method=5
time_base=0/1
g=12
ar=0
@@ -18,7 +17,6 @@ stream=0, decode=0
qdiff=3
bf=0
b_qfactor=1.250000
- rc_strategy=0
b_strategy=0
ps=0
mv_bits=0
@@ -38,18 +36,12 @@ stream=0, decode=0
has_b_frames=0
block_align=0
mpeg_quant=0
- qsquish=0.000000
- rc_qmod_amp=0.000000
- rc_qmod_freq=0
rc_override_count=0
- rc_eq=
maxrate=0
minrate=0
bufsize=0
- rc_buf_aggressivity=1.000000
i_qfactor=-0.800000
i_qoffset=0.000000
- rc_init_cplx=0.000000
dct=0
lumi_mask=0.000000
tcplx_mask=0.000000
@@ -64,7 +56,6 @@ stream=0, decode=0
aspect=180/180
sar=180/180
debug=0x00000000
- vismv=0x00000000
cmp=0
subcmp=0
mbcmp=0
@@ -75,27 +66,17 @@ stream=0, decode=0
precmp=0
pre_dia_size=0
subq=8
- dtg_active_format=0
me_range=0
- ibias=999999
- pbias=999999
global_quality=0
coder=0
context=0
slice_flags=0
- xvmc_acceleration=0
mbd=0
- stream_codec_tag=0
sc_threshold=0
- lmin=0
- lmax=0
nr=0
rc_init_occupancy=0
flags2=0x00000000
- error=0
threads=1
- me_threshold=0
- mb_threshold=0
dc=0
nssew=8
skip_top=0
@@ -107,7 +88,6 @@ stream=0, decode=0
skip_factor=0
skip_exp=0
skipcmp=13
- border_mask=0.000000
mblmin=236
mblmax=3658
mepc=256
@@ -120,7 +100,6 @@ stream=0, decode=0
refs=1
chromaoffset=0
trellis=0
- sc_factor=6
mv0_threshold=256
b_sensitivity=40
compression_level=-1
@@ -163,7 +142,6 @@ stream=0, decode=1
ab=0
bt=4000000
flags=0x00000000
- me_method=5
time_base=0/1
g=12
ar=0
@@ -178,7 +156,6 @@ stream=0, decode=1
qdiff=3
bf=0
b_qfactor=1.250000
- rc_strategy=0
b_strategy=0
ps=0
mv_bits=0
@@ -198,18 +175,12 @@ stream=0, decode=1
has_b_frames=0
block_align=0
mpeg_quant=0
- qsquish=0.000000
- rc_qmod_amp=0.000000
- rc_qmod_freq=0
rc_override_count=0
- rc_eq=
maxrate=0
minrate=0
bufsize=0
- rc_buf_aggressivity=1.000000
i_qfactor=-0.800000
i_qoffset=0.000000
- rc_init_cplx=0.000000
dct=0
lumi_mask=0.000000
tcplx_mask=0.000000
@@ -224,7 +195,6 @@ stream=0, decode=1
aspect=180/180
sar=180/180
debug=0x00000000
- vismv=0x00000000
cmp=0
subcmp=0
mbcmp=0
@@ -235,27 +205,17 @@ stream=0, decode=1
precmp=0
pre_dia_size=0
subq=8
- dtg_active_format=0
me_range=0
- ibias=999999
- pbias=999999
global_quality=0
coder=0
context=0
slice_flags=0
- xvmc_acceleration=0
mbd=0
- stream_codec_tag=0
sc_threshold=0
- lmin=0
- lmax=0
nr=0
rc_init_occupancy=0
flags2=0x00000000
- error=0
threads=1
- me_threshold=0
- mb_threshold=0
dc=0
nssew=8
skip_top=0
@@ -267,7 +227,6 @@ stream=0, decode=1
skip_factor=0
skip_exp=0
skipcmp=13
- border_mask=0.000000
mblmin=236
mblmax=3658
mepc=256
@@ -280,7 +239,6 @@ stream=0, decode=1
refs=1
chromaoffset=0
trellis=0
- sc_factor=6
mv0_threshold=256
b_sensitivity=40
compression_level=-1
diff --git a/tests/ref/fate/api-png-codec-param b/tests/ref/fate/api-png-codec-param
index de86f1b25d..c6ea7c6296 100644
--- a/tests/ref/fate/api-png-codec-param
+++ b/tests/ref/fate/api-png-codec-param
@@ -3,7 +3,6 @@ stream=0, decode=0
ab=0
bt=4000000
flags=0x00000000
- me_method=5
time_base=0/1
g=12
ar=0
@@ -18,7 +17,6 @@ stream=0, decode=0
qdiff=3
bf=0
b_qfactor=1.250000
- rc_strategy=0
b_strategy=0
ps=0
mv_bits=0
@@ -38,18 +36,12 @@ stream=0, decode=0
has_b_frames=0
block_align=0
mpeg_quant=0
- qsquish=0.000000
- rc_qmod_amp=0.000000
- rc_qmod_freq=0
rc_override_count=0
- rc_eq=
maxrate=0
minrate=0
bufsize=0
- rc_buf_aggressivity=1.000000
i_qfactor=-0.800000
i_qoffset=0.000000
- rc_init_cplx=0.000000
dct=0
lumi_mask=0.000000
tcplx_mask=0.000000
@@ -64,7 +56,6 @@ stream=0, decode=0
aspect=2835/2835
sar=2835/2835
debug=0x00000000
- vismv=0x00000000
cmp=0
subcmp=0
mbcmp=0
@@ -75,27 +66,17 @@ stream=0, decode=0
precmp=0
pre_dia_size=0
subq=8
- dtg_active_format=0
me_range=0
- ibias=999999
- pbias=999999
global_quality=0
coder=0
context=0
slice_flags=0
- xvmc_acceleration=0
mbd=0
- stream_codec_tag=0
sc_threshold=0
- lmin=0
- lmax=0
nr=0
rc_init_occupancy=0
flags2=0x00000000
- error=0
threads=1
- me_threshold=0
- mb_threshold=0
dc=0
nssew=8
skip_top=0
@@ -107,7 +88,6 @@ stream=0, decode=0
skip_factor=0
skip_exp=0
skipcmp=13
- border_mask=0.000000
mblmin=236
mblmax=3658
mepc=256
@@ -120,7 +100,6 @@ stream=0, decode=0
refs=1
chromaoffset=0
trellis=0
- sc_factor=6
mv0_threshold=256
b_sensitivity=40
compression_level=-1
@@ -163,7 +142,6 @@ stream=0, decode=1
ab=0
bt=4000000
flags=0x00000000
- me_method=5
time_base=0/1
g=12
ar=0
@@ -178,7 +156,6 @@ stream=0, decode=1
qdiff=3
bf=0
b_qfactor=1.250000
- rc_strategy=0
b_strategy=0
ps=0
mv_bits=0
@@ -198,18 +175,12 @@ stream=0, decode=1
has_b_frames=0
block_align=0
mpeg_quant=0
- qsquish=0.000000
- rc_qmod_amp=0.000000
- rc_qmod_freq=0
rc_override_count=0
- rc_eq=
maxrate=0
minrate=0
bufsize=0
- rc_buf_aggressivity=1.000000
i_qfactor=-0.800000
i_qoffset=0.000000
- rc_init_cplx=0.000000
dct=0
lumi_mask=0.000000
tcplx_mask=0.000000
@@ -224,7 +195,6 @@ stream=0, decode=1
aspect=2835/2835
sar=2835/2835
debug=0x00000000
- vismv=0x00000000
cmp=0
subcmp=0
mbcmp=0
@@ -235,27 +205,17 @@ stream=0, decode=1
precmp=0
pre_dia_size=0
subq=8
- dtg_active_format=0
me_range=0
- ibias=999999
- pbias=999999
global_quality=0
coder=0
context=0
slice_flags=0
- xvmc_acceleration=0
mbd=0
- stream_codec_tag=0
sc_threshold=0
- lmin=0
- lmax=0
nr=0
rc_init_occupancy=0
flags2=0x00000000
- error=0
threads=1
- me_threshold=0
- mb_threshold=0
dc=0
nssew=8
skip_top=0
@@ -267,7 +227,6 @@ stream=0, decode=1
skip_factor=0
skip_exp=0
skipcmp=13
- border_mask=0.000000
mblmin=236
mblmax=3658
mepc=256
@@ -280,7 +239,6 @@ stream=0, decode=1
refs=1
chromaoffset=0
trellis=0
- sc_factor=6
mv0_threshold=256
b_sensitivity=40
compression_level=-1
======================================================================
diff --cc libavcodec/version.h
index 1a513f2e72,2b9290316c..9f1543a6aa
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@@ -27,9 -27,9 +27,9 @@@
#include "libavutil/version.h"
- #define LIBAVCODEC_VERSION_MAJOR 57
- #define LIBAVCODEC_VERSION_MINOR 108
- #define LIBAVCODEC_VERSION_MICRO 101
-#define LIBAVCODEC_VERSION_MAJOR 58
-#define LIBAVCODEC_VERSION_MINOR 0
-#define LIBAVCODEC_VERSION_MICRO 0
++#define LIBAVCODEC_VERSION_MAJOR 58
++#define LIBAVCODEC_VERSION_MINOR 0
++#define LIBAVCODEC_VERSION_MICRO 100
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \
@@@ -64,7 -54,7 +64,7 @@@
#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_LOWRES
--#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 58)
++#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_CAP_VDPAU
#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
@@@ -151,35 -140,29 +151,35 @@@
#ifndef FF_API_AUDIOENC_DELAY
#define FF_API_AUDIOENC_DELAY (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
+#ifndef FF_API_VAAPI_CONTEXT
+#define FF_API_VAAPI_CONTEXT (LIBAVCODEC_VERSION_MAJOR < 58)
+#endif
+#ifndef FF_API_MERGE_SD
+#define FF_API_MERGE_SD (LIBAVCODEC_VERSION_MAJOR < 58)
+#endif
#ifndef FF_API_AVCTX_TIMEBASE
-#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 58)
+#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_MPV_OPT
- #define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
+ #define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_STREAM_CODEC_TAG
- #define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 59)
+ #define FF_API_STREAM_CODEC_TAG (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_QUANT_BIAS
- #define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 59)
+ #define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_RC_STRATEGY
- #define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59)
+ #define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_CODED_FRAME
-#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 58)
+#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
#endif
#ifndef FF_API_MOTION_EST
- #define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59)
+ #define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_WITHOUT_PREFIX
- #define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59)
+ #define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_SIDEDATA_ONLY_PKT
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
diff --cc libavdevice/version.h
index 68defac417,1bcb32c4c9..364404d65e
--- a/libavdevice/version.h
+++ b/libavdevice/version.h
@@@ -27,9 -27,9 +27,9 @@@
#include "libavutil/version.h"
- #define LIBAVDEVICE_VERSION_MAJOR 57
- #define LIBAVDEVICE_VERSION_MINOR 11
- #define LIBAVDEVICE_VERSION_MICRO 101
-#define LIBAVDEVICE_VERSION_MAJOR 57
-#define LIBAVDEVICE_VERSION_MINOR 0
-#define LIBAVDEVICE_VERSION_MICRO 0
++#define LIBAVDEVICE_VERSION_MAJOR 58
++#define LIBAVDEVICE_VERSION_MINOR 0
++#define LIBAVDEVICE_VERSION_MICRO 100
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
LIBAVDEVICE_VERSION_MINOR, \
diff --cc libavfilter/version.h
index 788d0a72d5,9a0a2c90ad..a350f47686
--- a/libavfilter/version.h
+++ b/libavfilter/version.h
@@@ -29,9 -29,9 +29,9 @@@
#include "libavutil/version.h"
- #define LIBAVFILTER_VERSION_MAJOR 6
- #define LIBAVFILTER_VERSION_MINOR 108
-#define LIBAVFILTER_VERSION_MAJOR 7
-#define LIBAVFILTER_VERSION_MINOR 0
-#define LIBAVFILTER_VERSION_MICRO 0
++#define LIBAVFILTER_VERSION_MAJOR 7
++#define LIBAVFILTER_VERSION_MINOR 0
+#define LIBAVFILTER_VERSION_MICRO 100
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
LIBAVFILTER_VERSION_MINOR, \
@@@ -52,9 -52,6 +52,9 @@@
#ifndef FF_API_OLD_FILTER_OPTS
#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
+#ifndef FF_API_OLD_FILTER_OPTS_ERROR
- #define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 7)
++#define FF_API_OLD_FILTER_OPTS_ERROR (LIBAVFILTER_VERSION_MAJOR < 8)
+#endif
#ifndef FF_API_AVFILTER_OPEN
#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
@@@ -67,8 -64,5 +67,8 @@@
#ifndef FF_API_NOCONST_GET_NAME
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7)
#endif
+#ifndef FF_API_LAVR_OPTS
- #define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 7)
++#define FF_API_LAVR_OPTS (LIBAVFILTER_VERSION_MAJOR < 8)
+#endif
#endif /* AVFILTER_VERSION_H */
diff --cc libavformat/version.h
index 22f82a37f7,7103b5d969..ed0439a26a
--- a/libavformat/version.h
+++ b/libavformat/version.h
@@@ -29,11 -29,9 +29,11 @@@
#include "libavutil/version.h"
-#define LIBAVFORMAT_VERSION_MAJOR 58
-#define LIBAVFORMAT_VERSION_MINOR 0
-#define LIBAVFORMAT_VERSION_MICRO 0
+// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
+// Also please add any ticket numbers that you believe might be affected here
- #define LIBAVFORMAT_VERSION_MAJOR 57
- #define LIBAVFORMAT_VERSION_MINOR 84
- #define LIBAVFORMAT_VERSION_MICRO 101
++#define LIBAVFORMAT_VERSION_MAJOR 58
++#define LIBAVFORMAT_VERSION_MINOR 0
++#define LIBAVFORMAT_VERSION_MICRO 100
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
LIBAVFORMAT_VERSION_MINOR, \
@@@ -64,42 -57,14 +64,42 @@@
#ifndef FF_API_LAVF_CODEC_TB
#define FF_API_LAVF_CODEC_TB (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
+#ifndef FF_API_URL_FEOF
+#define FF_API_URL_FEOF (LIBAVFORMAT_VERSION_MAJOR < 58)
+#endif
#ifndef FF_API_LAVF_FMT_RAWPICTURE
-#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 59)
+#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58)
#endif
#ifndef FF_API_COMPUTE_PKT_FIELDS2
- #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 58)
+ #define FF_API_COMPUTE_PKT_FIELDS2 (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
+#ifndef FF_API_OLD_OPEN_CALLBACKS
- #define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 58)
++#define FF_API_OLD_OPEN_CALLBACKS (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
#ifndef FF_API_LAVF_AVCTX
- #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58)
+ #define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
#endif
+#ifndef FF_API_NOCONST_GET_SIDE_DATA
+#define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58)
+#endif
+#ifndef FF_API_HTTP_USER_AGENT
- #define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 58)
++#define FF_API_HTTP_USER_AGENT (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+#ifndef FF_API_HLS_WRAP
- #define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 58)
++#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+#ifndef FF_API_LAVF_MERGE_SD
+#define FF_API_LAVF_MERGE_SD (LIBAVFORMAT_VERSION_MAJOR < 58)
+#endif
+#ifndef FF_API_LAVF_KEEPSIDE_FLAG
- #define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 58)
++#define FF_API_LAVF_KEEPSIDE_FLAG (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+#ifndef FF_API_OLD_ROTATE_API
- #define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 58)
++#define FF_API_OLD_ROTATE_API (LIBAVFORMAT_VERSION_MAJOR < 59)
+#endif
+
+#ifndef FF_API_R_FRAME_RATE
+#define FF_API_R_FRAME_RATE 1
+#endif
#endif /* AVFORMAT_VERSION_H */
diff --cc libavutil/version.h
index bf5ea15abe,93f471f99b..e9b8d0c37d
--- a/libavutil/version.h
+++ b/libavutil/version.h
@@@ -78,10 -53,9 +78,10 @@@
* @{
*/
-#define LIBAVUTIL_VERSION_MAJOR 56
-#define LIBAVUTIL_VERSION_MINOR 0
-#define LIBAVUTIL_VERSION_MICRO 0
+
- #define LIBAVUTIL_VERSION_MAJOR 55
- #define LIBAVUTIL_VERSION_MINOR 79
++#define LIBAVUTIL_VERSION_MAJOR 56
++#define LIBAVUTIL_VERSION_MINOR 0
+#define LIBAVUTIL_VERSION_MICRO 100
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
LIBAVUTIL_VERSION_MINOR, \
@@@ -118,26 -90,23 +118,26 @@@
#ifndef FF_API_DLOG
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
-#ifndef FF_API_CRYPTO_CONTEXT
-#define FF_API_CRYPTO_CONTEXT (LIBAVUTIL_VERSION_MAJOR < 57)
+#ifndef FF_API_VAAPI
- #define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56)
++#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
+#endif
+#ifndef FF_API_FRAME_QP
- #define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
++#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_PLUS1_MINUS1
--#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
++#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_ERROR_FRAME
--#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56)
++#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
-#ifndef FF_API_VAAPI
-#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
+#ifndef FF_API_CRC_BIG_TABLE
+#define FF_API_CRC_BIG_TABLE (LIBAVUTIL_VERSION_MAJOR < 56)
#endif
#ifndef FF_API_PKT_PTS
- #define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 56)
+ #define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
#ifndef FF_API_CRYPTO_SIZE_T
- #define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 56)
+ #define FF_API_CRYPTO_SIZE_T (LIBAVUTIL_VERSION_MAJOR < 57)
#endif
diff --cc libpostproc/version.h
index a8f2fa4ea8,0000000000..3ae75ff8b0
mode 100644,000000..100644
--- a/libpostproc/version.h
+++ b/libpostproc/version.h
@@@ -1,49 -1,0 +1,49 @@@
+/*
+ * Version macros.
+ *
+ * This file is part of FFmpeg.
+ *
+ * FFmpeg is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * FFmpeg is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with FFmpeg; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef POSTPROC_VERSION_H
+#define POSTPROC_VERSION_H
+
+/**
+ * @file
+ * Libpostproc version macros
+ */
+
+#include "libavutil/avutil.h"
+
- #define LIBPOSTPROC_VERSION_MAJOR 54
- #define LIBPOSTPROC_VERSION_MINOR 8
++#define LIBPOSTPROC_VERSION_MAJOR 55
++#define LIBPOSTPROC_VERSION_MINOR 0
+#define LIBPOSTPROC_VERSION_MICRO 100
+
+#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
+ LIBPOSTPROC_VERSION_MINOR, \
+ LIBPOSTPROC_VERSION_MICRO)
+#define LIBPOSTPROC_VERSION AV_VERSION(LIBPOSTPROC_VERSION_MAJOR, \
+ LIBPOSTPROC_VERSION_MINOR, \
+ LIBPOSTPROC_VERSION_MICRO)
+#define LIBPOSTPROC_BUILD LIBPOSTPROC_VERSION_INT
+
+#define LIBPOSTPROC_IDENT "postproc" AV_STRINGIFY(LIBPOSTPROC_VERSION)
+
+#ifndef FF_API_QP_TYPE
+#define FF_API_QP_TYPE (LIBPOSTPROC_VERSION_MAJOR < 55)
+#endif
+
+#endif /* POSTPROC_VERSION_H */
diff --cc libswresample/version.h
index 46424ae28a,0000000000..54dfd71e42
mode 100644,000000..100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@@ -1,45 -1,0 +1,45 @@@
+/*
+ * Version macros.
+ *
+ * This file is part of libswresample
+ *
+ * libswresample is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * libswresample is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with libswresample; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ */
+
+#ifndef SWRESAMPLE_VERSION_H
+#define SWRESAMPLE_VERSION_H
+
+/**
+ * @file
+ * Libswresample version macros
+ */
+
+#include "libavutil/avutil.h"
+
- #define LIBSWRESAMPLE_VERSION_MAJOR 2
- #define LIBSWRESAMPLE_VERSION_MINOR 10
++#define LIBSWRESAMPLE_VERSION_MAJOR 3
++#define LIBSWRESAMPLE_VERSION_MINOR 0
+#define LIBSWRESAMPLE_VERSION_MICRO 100
+
+#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
+ LIBSWRESAMPLE_VERSION_MINOR, \
+ LIBSWRESAMPLE_VERSION_MICRO)
+#define LIBSWRESAMPLE_VERSION AV_VERSION(LIBSWRESAMPLE_VERSION_MAJOR, \
+ LIBSWRESAMPLE_VERSION_MINOR, \
+ LIBSWRESAMPLE_VERSION_MICRO)
+#define LIBSWRESAMPLE_BUILD LIBSWRESAMPLE_VERSION_INT
+
+#define LIBSWRESAMPLE_IDENT "SwR" AV_STRINGIFY(LIBSWRESAMPLE_VERSION)
+
+#endif /* SWRESAMPLE_VERSION_H */
diff --cc libswscale/version.h
index 23d5b0c4e9,5badd3d321..9c24122031
--- a/libswscale/version.h
+++ b/libswscale/version.h
@@@ -26,9 -26,9 +26,9 @@@
#include "libavutil/version.h"
- #define LIBSWSCALE_VERSION_MAJOR 4
- #define LIBSWSCALE_VERSION_MINOR 9
-#define LIBSWSCALE_VERSION_MAJOR 5
-#define LIBSWSCALE_VERSION_MINOR 0
-#define LIBSWSCALE_VERSION_MICRO 0
++#define LIBSWSCALE_VERSION_MAJOR 5
++#define LIBSWSCALE_VERSION_MINOR 0
+#define LIBSWSCALE_VERSION_MICRO 100
#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
LIBSWSCALE_VERSION_MINOR, \
diff --cc tests/ref/fate/api-mjpeg-codec-param
index 02f656df25,0000000000..178b7c73cb
mode 100644,000000..100644
--- a/tests/ref/fate/api-mjpeg-codec-param
+++ b/tests/ref/fate/api-mjpeg-codec-param
@@@ -1,320 -1,0 +1,278 @@@
+stream=0, decode=0
+ b=0
+ ab=0
+ bt=4000000
+ flags=0x00000000
- me_method=5
+ time_base=0/1
+ g=12
+ ar=0
+ ac=0
+ cutoff=0
+ frame_size=0
+ delay=0
+ qcomp=0.500000
+ qblur=0.500000
+ qmin=2
+ qmax=31
+ qdiff=3
+ bf=0
+ b_qfactor=1.250000
- rc_strategy=0
+ b_strategy=0
+ ps=0
+ mv_bits=0
+ header_bits=0
+ i_tex_bits=0
+ p_tex_bits=0
+ i_count=0
+ p_count=0
+ skip_count=0
+ misc_bits=0
+ frame_bits=0
+ codec_tag=0
+ bug=0x00000001
+ strict=0
+ b_qoffset=1.250000
+ err_detect=0x00000000
+ has_b_frames=0
+ block_align=0
+ mpeg_quant=0
- qsquish=0.000000
- rc_qmod_amp=0.000000
- rc_qmod_freq=0
+ rc_override_count=0
- rc_eq=
+ maxrate=0
+ minrate=0
+ bufsize=0
- rc_buf_aggressivity=1.000000
+ i_qfactor=-0.800000
+ i_qoffset=0.000000
- rc_init_cplx=0.000000
+ dct=0
+ lumi_mask=0.000000
+ tcplx_mask=0.000000
+ scplx_mask=0.000000
+ p_mask=0.000000
+ dark_mask=0.000000
+ idct=0
+ slice_count=0
+ ec=0x00000003
+ bits_per_coded_sample=0
+ pred=0
+ aspect=180/180
+ sar=180/180
+ debug=0x00000000
- vismv=0x00000000
+ cmp=0
+ subcmp=0
+ mbcmp=0
+ ildctcmp=8
+ dia_size=0
+ last_pred=0
+ preme=0
+ precmp=0
+ pre_dia_size=0
+ subq=8
- dtg_active_format=0
+ me_range=0
- ibias=999999
- pbias=999999
+ global_quality=0
+ coder=0
+ context=0
+ slice_flags=0
- xvmc_acceleration=0
+ mbd=0
- stream_codec_tag=0
+ sc_threshold=0
- lmin=0
- lmax=0
+ nr=0
+ rc_init_occupancy=0
+ flags2=0x00000000
- error=0
+ threads=1
- me_threshold=0
- mb_threshold=0
+ dc=0
+ nssew=8
+ skip_top=0
+ skip_bottom=0
+ profile=-99
+ level=-99
+ lowres=0
+ skip_threshold=0
+ skip_factor=0
+ skip_exp=0
+ skipcmp=13
- border_mask=0.000000
+ mblmin=236
+ mblmax=3658
+ mepc=256
+ skip_loop_filter=0
+ skip_idct=0
+ skip_frame=0
+ bidir_refine=1
+ brd_scale=0
+ keyint_min=25
+ refs=1
+ chromaoffset=0
+ trellis=0
- sc_factor=6
+ mv0_threshold=256
+ b_sensitivity=40
+ compression_level=-1
+ min_prediction_order=-1
+ max_prediction_order=-1
+ timecode_frame_start=-1
+ bits_per_raw_sample=8
+ channel_layout=0
+ request_channel_layout=0
+ rc_max_vbv_use=0.000000
+ rc_min_vbv_use=3.000000
+ ticks_per_frame=1
+ color_primaries=2
+ color_trc=2
+ colorspace=5
+ color_range=2
+ chroma_sample_location=2
+ log_level_offset=0
+ slices=0
+ thread_type=0x00000003
+ audio_service_type=0
+ request_sample_fmt=none
+ pkt_timebase=1/25
+ sub_charenc=
+ sub_charenc_mode=0x00000000
+ sub_text_format=1
+ refcounted_frames=false
+ side_data_only_packets=true
+ apply_cropping=true
+ skip_alpha=false
+ field_order=0
+ dump_separator=
+ codec_whitelist=
+ pixel_format=yuvj422p
+ video_size=400x225
+ max_pixels=2147483647
+ hwaccel_flags=0x00000001
+stream=0, decode=1
+ b=0
+ ab=0
+ bt=4000000
+ flags=0x00000000
- me_method=5
+ time_base=0/1
+ g=12
+ ar=0
+ ac=0
+ cutoff=0
+ frame_size=0
+ delay=0
+ qcomp=0.500000
+ qblur=0.500000
+ qmin=2
+ qmax=31
+ qdiff=3
+ bf=0
+ b_qfactor=1.250000
- rc_strategy=0
+ b_strategy=0
+ ps=0
+ mv_bits=0
+ header_bits=0
+ i_tex_bits=0
+ p_tex_bits=0
+ i_count=0
+ p_count=0
+ skip_count=0
+ misc_bits=0
+ frame_bits=0
+ codec_tag=0
+ bug=0x00000001
+ strict=0
+ b_qoffset=1.250000
+ err_detect=0x00000000
+ has_b_frames=0
+ block_align=0
+ mpeg_quant=0
- qsquish=0.000000
- rc_qmod_amp=0.000000
- rc_qmod_freq=0
+ rc_override_count=0
- rc_eq=
+ maxrate=0
+ minrate=0
+ bufsize=0
- rc_buf_aggressivity=1.000000
+ i_qfactor=-0.800000
+ i_qoffset=0.000000
- rc_init_cplx=0.000000
+ dct=0
+ lumi_mask=0.000000
+ tcplx_mask=0.000000
+ scplx_mask=0.000000
+ p_mask=0.000000
+ dark_mask=0.000000
+ idct=0
+ slice_count=0
+ ec=0x00000003
+ bits_per_coded_sample=0
+ pred=0
+ aspect=180/180
+ sar=180/180
+ debug=0x00000000
- vismv=0x00000000
+ cmp=0
+ subcmp=0
+ mbcmp=0
+ ildctcmp=8
+ dia_size=0
+ last_pred=0
+ preme=0
+ precmp=0
+ pre_dia_size=0
+ subq=8
- dtg_active_format=0
+ me_range=0
- ibias=999999
- pbias=999999
+ global_quality=0
+ coder=0
+ context=0
+ slice_flags=0
- xvmc_acceleration=0
+ mbd=0
- stream_codec_tag=0
+ sc_threshold=0
- lmin=0
- lmax=0
+ nr=0
+ rc_init_occupancy=0
+ flags2=0x00000000
- error=0
+ threads=1
- me_threshold=0
- mb_threshold=0
+ dc=0
+ nssew=8
+ skip_top=0
+ skip_bottom=0
+ profile=-99
+ level=-99
+ lowres=0
+ skip_threshold=0
+ skip_factor=0
+ skip_exp=0
+ skipcmp=13
- border_mask=0.000000
+ mblmin=236
+ mblmax=3658
+ mepc=256
+ skip_loop_filter=0
+ skip_idct=0
+ skip_frame=0
+ bidir_refine=1
+ brd_scale=0
+ keyint_min=25
+ refs=1
+ chromaoffset=0
+ trellis=0
- sc_factor=6
+ mv0_threshold=256
+ b_sensitivity=40
+ compression_level=-1
+ min_prediction_order=-1
+ max_prediction_order=-1
+ timecode_frame_start=-1
+ bits_per_raw_sample=8
+ channel_layout=0
+ request_channel_layout=0
+ rc_max_vbv_use=0.000000
+ rc_min_vbv_use=3.000000
+ ticks_per_frame=1
+ color_primaries=2
+ color_trc=2
+ colorspace=5
+ color_range=2
+ chroma_sample_location=2
+ log_level_offset=0
+ slices=0
+ thread_type=0x00000003
+ audio_service_type=0
+ request_sample_fmt=none
+ pkt_timebase=1/25
+ sub_charenc=
+ sub_charenc_mode=0x00000000
+ sub_text_format=1
+ refcounted_frames=false
+ side_data_only_packets=true
+ apply_cropping=true
+ skip_alpha=false
+ field_order=0
+ dump_separator=
+ codec_whitelist=
+ pixel_format=yuvj422p
+ video_size=400x225
+ max_pixels=2147483647
+ hwaccel_flags=0x00000001
diff --cc tests/ref/fate/api-png-codec-param
index de86f1b25d,0000000000..c6ea7c6296
mode 100644,000000..100644
--- a/tests/ref/fate/api-png-codec-param
+++ b/tests/ref/fate/api-png-codec-param
@@@ -1,320 -1,0 +1,278 @@@
+stream=0, decode=0
+ b=0
+ ab=0
+ bt=4000000
+ flags=0x00000000
- me_method=5
+ time_base=0/1
+ g=12
+ ar=0
+ ac=0
+ cutoff=0
+ frame_size=0
+ delay=0
+ qcomp=0.500000
+ qblur=0.500000
+ qmin=2
+ qmax=31
+ qdiff=3
+ bf=0
+ b_qfactor=1.250000
- rc_strategy=0
+ b_strategy=0
+ ps=0
+ mv_bits=0
+ header_bits=0
+ i_tex_bits=0
+ p_tex_bits=0
+ i_count=0
+ p_count=0
+ skip_count=0
+ misc_bits=0
+ frame_bits=0
+ codec_tag=0
+ bug=0x00000001
+ strict=0
+ b_qoffset=1.250000
+ err_detect=0x00000000
+ has_b_frames=0
+ block_align=0
+ mpeg_quant=0
- qsquish=0.000000
- rc_qmod_amp=0.000000
- rc_qmod_freq=0
+ rc_override_count=0
- rc_eq=
+ maxrate=0
+ minrate=0
+ bufsize=0
- rc_buf_aggressivity=1.000000
+ i_qfactor=-0.800000
+ i_qoffset=0.000000
- rc_init_cplx=0.000000
+ dct=0
+ lumi_mask=0.000000
+ tcplx_mask=0.000000
+ scplx_mask=0.000000
+ p_mask=0.000000
+ dark_mask=0.000000
+ idct=0
+ slice_count=0
+ ec=0x00000003
+ bits_per_coded_sample=0
+ pred=0
+ aspect=2835/2835
+ sar=2835/2835
+ debug=0x00000000
- vismv=0x00000000
+ cmp=0
+ subcmp=0
+ mbcmp=0
+ ildctcmp=8
+ dia_size=0
+ last_pred=0
+ preme=0
+ precmp=0
+ pre_dia_size=0
+ subq=8
- dtg_active_format=0
+ me_range=0
- ibias=999999
- pbias=999999
+ global_quality=0
+ coder=0
+ context=0
+ slice_flags=0
- xvmc_acceleration=0
+ mbd=0
- stream_codec_tag=0
+ sc_threshold=0
- lmin=0
- lmax=0
+ nr=0
+ rc_init_occupancy=0
+ flags2=0x00000000
- error=0
+ threads=1
- me_threshold=0
- mb_threshold=0
+ dc=0
+ nssew=8
+ skip_top=0
+ skip_bottom=0
+ profile=-99
+ level=-99
+ lowres=0
+ skip_threshold=0
+ skip_factor=0
+ skip_exp=0
+ skipcmp=13
- border_mask=0.000000
+ mblmin=236
+ mblmax=3658
+ mepc=256
+ skip_loop_filter=0
+ skip_idct=0
+ skip_frame=0
+ bidir_refine=1
+ brd_scale=0
+ keyint_min=25
+ refs=1
+ chromaoffset=0
+ trellis=0
- sc_factor=6
+ mv0_threshold=256
+ b_sensitivity=40
+ compression_level=-1
+ min_prediction_order=-1
+ max_prediction_order=-1
+ timecode_frame_start=-1
+ bits_per_raw_sample=0
+ channel_layout=0
+ request_channel_layout=0
+ rc_max_vbv_use=0.000000
+ rc_min_vbv_use=3.000000
+ ticks_per_frame=1
+ color_primaries=2
+ color_trc=2
+ colorspace=2
+ color_range=2
+ chroma_sample_location=0
+ log_level_offset=0
+ slices=0
+ thread_type=0x00000003
+ audio_service_type=0
+ request_sample_fmt=none
+ pkt_timebase=1/25
+ sub_charenc=
+ sub_charenc_mode=0x00000000
+ sub_text_format=1
+ refcounted_frames=false
+ side_data_only_packets=true
+ apply_cropping=true
+ skip_alpha=false
+ field_order=0
+ dump_separator=
+ codec_whitelist=
+ pixel_format=rgba
+ video_size=128x128
+ max_pixels=2147483647
+ hwaccel_flags=0x00000001
+stream=0, decode=1
+ b=0
+ ab=0
+ bt=4000000
+ flags=0x00000000
- me_method=5
+ time_base=0/1
+ g=12
+ ar=0
+ ac=0
+ cutoff=0
+ frame_size=0
+ delay=0
+ qcomp=0.500000
+ qblur=0.500000
+ qmin=2
+ qmax=31
+ qdiff=3
+ bf=0
+ b_qfactor=1.250000
- rc_strategy=0
+ b_strategy=0
+ ps=0
+ mv_bits=0
+ header_bits=0
+ i_tex_bits=0
+ p_tex_bits=0
+ i_count=0
+ p_count=0
+ skip_count=0
+ misc_bits=0
+ frame_bits=0
+ codec_tag=0
+ bug=0x00000001
+ strict=0
+ b_qoffset=1.250000
+ err_detect=0x00000000
+ has_b_frames=0
+ block_align=0
+ mpeg_quant=0
- qsquish=0.000000
- rc_qmod_amp=0.000000
- rc_qmod_freq=0
+ rc_override_count=0
- rc_eq=
+ maxrate=0
+ minrate=0
+ bufsize=0
- rc_buf_aggressivity=1.000000
+ i_qfactor=-0.800000
+ i_qoffset=0.000000
- rc_init_cplx=0.000000
+ dct=0
+ lumi_mask=0.000000
+ tcplx_mask=0.000000
+ scplx_mask=0.000000
+ p_mask=0.000000
+ dark_mask=0.000000
+ idct=0
+ slice_count=0
+ ec=0x00000003
+ bits_per_coded_sample=0
+ pred=0
+ aspect=2835/2835
+ sar=2835/2835
+ debug=0x00000000
- vismv=0x00000000
+ cmp=0
+ subcmp=0
+ mbcmp=0
+ ildctcmp=8
+ dia_size=0
+ last_pred=0
+ preme=0
+ precmp=0
+ pre_dia_size=0
+ subq=8
- dtg_active_format=0
+ me_range=0
- ibias=999999
- pbias=999999
+ global_quality=0
+ coder=0
+ context=0
+ slice_flags=0
- xvmc_acceleration=0
+ mbd=0
- stream_codec_tag=0
+ sc_threshold=0
- lmin=0
- lmax=0
+ nr=0
+ rc_init_occupancy=0
+ flags2=0x00000000
- error=0
+ threads=1
- me_threshold=0
- mb_threshold=0
+ dc=0
+ nssew=8
+ skip_top=0
+ skip_bottom=0
+ profile=-99
+ level=-99
+ lowres=0
+ skip_threshold=0
+ skip_factor=0
+ skip_exp=0
+ skipcmp=13
- border_mask=0.000000
+ mblmin=236
+ mblmax=3658
+ mepc=256
+ skip_loop_filter=0
+ skip_idct=0
+ skip_frame=0
+ bidir_refine=1
+ brd_scale=0
+ keyint_min=25
+ refs=1
+ chromaoffset=0
+ trellis=0
- sc_factor=6
+ mv0_threshold=256
+ b_sensitivity=40
+ compression_level=-1
+ min_prediction_order=-1
+ max_prediction_order=-1
+ timecode_frame_start=-1
+ bits_per_raw_sample=0
+ channel_layout=0
+ request_channel_layout=0
+ rc_max_vbv_use=0.000000
+ rc_min_vbv_use=3.000000
+ ticks_per_frame=1
+ color_primaries=2
+ color_trc=2
+ colorspace=2
+ color_range=2
+ chroma_sample_location=0
+ log_level_offset=0
+ slices=0
+ thread_type=0x00000003
+ audio_service_type=0
+ request_sample_fmt=none
+ pkt_timebase=1/25
+ sub_charenc=
+ sub_charenc_mode=0x00000000
+ sub_text_format=1
+ refcounted_frames=false
+ side_data_only_packets=true
+ apply_cropping=true
+ skip_alpha=false
+ field_order=0
+ dump_separator=
+ codec_whitelist=
+ pixel_format=rgba
+ video_size=128x128
+ max_pixels=2147483647
+ hwaccel_flags=0x00000001
More information about the ffmpeg-cvslog
mailing list