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@gmail.com>
This commit is contained in:
commit
69b5ce64d2
|
@ -27,9 +27,9 @@
|
||||||
|
|
||||||
#include "libavutil/version.h"
|
#include "libavutil/version.h"
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_MAJOR 57
|
#define LIBAVCODEC_VERSION_MAJOR 58
|
||||||
#define LIBAVCODEC_VERSION_MINOR 108
|
#define LIBAVCODEC_VERSION_MINOR 0
|
||||||
#define LIBAVCODEC_VERSION_MICRO 101
|
#define LIBAVCODEC_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
|
||||||
LIBAVCODEC_VERSION_MINOR, \
|
LIBAVCODEC_VERSION_MINOR, \
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58)
|
#define FF_API_MISSING_SAMPLE (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_LOWRES
|
#ifndef FF_API_LOWRES
|
||||||
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 58)
|
#define FF_API_LOWRES (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_CAP_VDPAU
|
#ifndef FF_API_CAP_VDPAU
|
||||||
#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
|
#define FF_API_CAP_VDPAU (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
|
@ -161,25 +161,25 @@
|
||||||
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_AVCTX_TIMEBASE (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_MPV_OPT
|
#ifndef FF_API_MPV_OPT
|
||||||
#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_MPV_OPT (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_STREAM_CODEC_TAG
|
#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
|
#endif
|
||||||
#ifndef FF_API_QUANT_BIAS
|
#ifndef FF_API_QUANT_BIAS
|
||||||
#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_QUANT_BIAS (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_RC_STRATEGY
|
#ifndef FF_API_RC_STRATEGY
|
||||||
#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_RC_STRATEGY (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_CODED_FRAME
|
#ifndef FF_API_CODED_FRAME
|
||||||
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_CODED_FRAME (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_MOTION_EST
|
#ifndef FF_API_MOTION_EST
|
||||||
#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_MOTION_EST (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_WITHOUT_PREFIX
|
#ifndef FF_API_WITHOUT_PREFIX
|
||||||
#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_WITHOUT_PREFIX (LIBAVCODEC_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_SIDEDATA_ONLY_PKT
|
#ifndef FF_API_SIDEDATA_ONLY_PKT
|
||||||
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
|
#define FF_API_SIDEDATA_ONLY_PKT (LIBAVCODEC_VERSION_MAJOR < 59)
|
||||||
|
|
|
@ -27,9 +27,9 @@
|
||||||
|
|
||||||
#include "libavutil/version.h"
|
#include "libavutil/version.h"
|
||||||
|
|
||||||
#define LIBAVDEVICE_VERSION_MAJOR 57
|
#define LIBAVDEVICE_VERSION_MAJOR 58
|
||||||
#define LIBAVDEVICE_VERSION_MINOR 11
|
#define LIBAVDEVICE_VERSION_MINOR 0
|
||||||
#define LIBAVDEVICE_VERSION_MICRO 101
|
#define LIBAVDEVICE_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
|
#define LIBAVDEVICE_VERSION_INT AV_VERSION_INT(LIBAVDEVICE_VERSION_MAJOR, \
|
||||||
LIBAVDEVICE_VERSION_MINOR, \
|
LIBAVDEVICE_VERSION_MINOR, \
|
||||||
|
|
|
@ -29,8 +29,8 @@
|
||||||
|
|
||||||
#include "libavutil/version.h"
|
#include "libavutil/version.h"
|
||||||
|
|
||||||
#define LIBAVFILTER_VERSION_MAJOR 6
|
#define LIBAVFILTER_VERSION_MAJOR 7
|
||||||
#define LIBAVFILTER_VERSION_MINOR 108
|
#define LIBAVFILTER_VERSION_MINOR 0
|
||||||
#define LIBAVFILTER_VERSION_MICRO 100
|
#define LIBAVFILTER_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
|
#define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \
|
||||||
|
@ -53,7 +53,7 @@
|
||||||
#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 7)
|
#define FF_API_OLD_FILTER_OPTS (LIBAVFILTER_VERSION_MAJOR < 7)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_OLD_FILTER_OPTS_ERROR
|
#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
|
#endif
|
||||||
#ifndef FF_API_AVFILTER_OPEN
|
#ifndef FF_API_AVFILTER_OPEN
|
||||||
#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 7)
|
#define FF_API_AVFILTER_OPEN (LIBAVFILTER_VERSION_MAJOR < 7)
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7)
|
#define FF_API_NOCONST_GET_NAME (LIBAVFILTER_VERSION_MAJOR < 7)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_LAVR_OPTS
|
#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
|
||||||
|
|
||||||
#endif /* AVFILTER_VERSION_H */
|
#endif /* AVFILTER_VERSION_H */
|
||||||
|
|
|
@ -31,9 +31,9 @@
|
||||||
|
|
||||||
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
|
// Major bumping may affect Ticket5467, 5421, 5451(compatibility with Chromium)
|
||||||
// Also please add any ticket numbers that you believe might be affected here
|
// Also please add any ticket numbers that you believe might be affected here
|
||||||
#define LIBAVFORMAT_VERSION_MAJOR 57
|
#define LIBAVFORMAT_VERSION_MAJOR 58
|
||||||
#define LIBAVFORMAT_VERSION_MINOR 84
|
#define LIBAVFORMAT_VERSION_MINOR 0
|
||||||
#define LIBAVFORMAT_VERSION_MICRO 101
|
#define LIBAVFORMAT_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
#define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \
|
||||||
LIBAVFORMAT_VERSION_MINOR, \
|
LIBAVFORMAT_VERSION_MINOR, \
|
||||||
|
@ -71,31 +71,31 @@
|
||||||
#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58)
|
#define FF_API_LAVF_FMT_RAWPICTURE (LIBAVFORMAT_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_COMPUTE_PKT_FIELDS2
|
#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
|
#endif
|
||||||
#ifndef FF_API_OLD_OPEN_CALLBACKS
|
#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
|
#endif
|
||||||
#ifndef FF_API_LAVF_AVCTX
|
#ifndef FF_API_LAVF_AVCTX
|
||||||
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 58)
|
#define FF_API_LAVF_AVCTX (LIBAVFORMAT_VERSION_MAJOR < 59)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_NOCONST_GET_SIDE_DATA
|
#ifndef FF_API_NOCONST_GET_SIDE_DATA
|
||||||
#define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58)
|
#define FF_API_NOCONST_GET_SIDE_DATA (LIBAVFORMAT_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_HTTP_USER_AGENT
|
#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
|
#endif
|
||||||
#ifndef FF_API_HLS_WRAP
|
#ifndef FF_API_HLS_WRAP
|
||||||
#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 58)
|
#define FF_API_HLS_WRAP (LIBAVFORMAT_VERSION_MAJOR < 59)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_LAVF_MERGE_SD
|
#ifndef FF_API_LAVF_MERGE_SD
|
||||||
#define FF_API_LAVF_MERGE_SD (LIBAVFORMAT_VERSION_MAJOR < 58)
|
#define FF_API_LAVF_MERGE_SD (LIBAVFORMAT_VERSION_MAJOR < 58)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_LAVF_KEEPSIDE_FLAG
|
#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
|
#endif
|
||||||
#ifndef FF_API_OLD_ROTATE_API
|
#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
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -27,8 +27,8 @@
|
||||||
|
|
||||||
#include "libavutil/version.h"
|
#include "libavutil/version.h"
|
||||||
|
|
||||||
#define LIBAVRESAMPLE_VERSION_MAJOR 3
|
#define LIBAVRESAMPLE_VERSION_MAJOR 4
|
||||||
#define LIBAVRESAMPLE_VERSION_MINOR 8
|
#define LIBAVRESAMPLE_VERSION_MINOR 0
|
||||||
#define LIBAVRESAMPLE_VERSION_MICRO 0
|
#define LIBAVRESAMPLE_VERSION_MICRO 0
|
||||||
|
|
||||||
#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \
|
#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \
|
||||||
|
|
|
@ -79,8 +79,8 @@
|
||||||
*/
|
*/
|
||||||
|
|
||||||
|
|
||||||
#define LIBAVUTIL_VERSION_MAJOR 55
|
#define LIBAVUTIL_VERSION_MAJOR 56
|
||||||
#define LIBAVUTIL_VERSION_MINOR 79
|
#define LIBAVUTIL_VERSION_MINOR 0
|
||||||
#define LIBAVUTIL_VERSION_MICRO 100
|
#define LIBAVUTIL_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
|
#define LIBAVUTIL_VERSION_INT AV_VERSION_INT(LIBAVUTIL_VERSION_MAJOR, \
|
||||||
|
@ -119,25 +119,25 @@
|
||||||
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
|
#define FF_API_DLOG (LIBAVUTIL_VERSION_MAJOR < 56)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_VAAPI
|
#ifndef FF_API_VAAPI
|
||||||
#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 56)
|
#define FF_API_VAAPI (LIBAVUTIL_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_FRAME_QP
|
#ifndef FF_API_FRAME_QP
|
||||||
#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 56)
|
#define FF_API_FRAME_QP (LIBAVUTIL_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_PLUS1_MINUS1
|
#ifndef FF_API_PLUS1_MINUS1
|
||||||
#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 56)
|
#define FF_API_PLUS1_MINUS1 (LIBAVUTIL_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_ERROR_FRAME
|
#ifndef FF_API_ERROR_FRAME
|
||||||
#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 56)
|
#define FF_API_ERROR_FRAME (LIBAVUTIL_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_CRC_BIG_TABLE
|
#ifndef FF_API_CRC_BIG_TABLE
|
||||||
#define FF_API_CRC_BIG_TABLE (LIBAVUTIL_VERSION_MAJOR < 56)
|
#define FF_API_CRC_BIG_TABLE (LIBAVUTIL_VERSION_MAJOR < 56)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_PKT_PTS
|
#ifndef FF_API_PKT_PTS
|
||||||
#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 56)
|
#define FF_API_PKT_PTS (LIBAVUTIL_VERSION_MAJOR < 57)
|
||||||
#endif
|
#endif
|
||||||
#ifndef FF_API_CRYPTO_SIZE_T
|
#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
|
#endif
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
|
|
||||||
#define LIBPOSTPROC_VERSION_MAJOR 54
|
#define LIBPOSTPROC_VERSION_MAJOR 55
|
||||||
#define LIBPOSTPROC_VERSION_MINOR 8
|
#define LIBPOSTPROC_VERSION_MINOR 0
|
||||||
#define LIBPOSTPROC_VERSION_MICRO 100
|
#define LIBPOSTPROC_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
|
#define LIBPOSTPROC_VERSION_INT AV_VERSION_INT(LIBPOSTPROC_VERSION_MAJOR, \
|
||||||
|
|
|
@ -28,8 +28,8 @@
|
||||||
|
|
||||||
#include "libavutil/avutil.h"
|
#include "libavutil/avutil.h"
|
||||||
|
|
||||||
#define LIBSWRESAMPLE_VERSION_MAJOR 2
|
#define LIBSWRESAMPLE_VERSION_MAJOR 3
|
||||||
#define LIBSWRESAMPLE_VERSION_MINOR 10
|
#define LIBSWRESAMPLE_VERSION_MINOR 0
|
||||||
#define LIBSWRESAMPLE_VERSION_MICRO 100
|
#define LIBSWRESAMPLE_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
|
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
|
||||||
|
|
|
@ -26,8 +26,8 @@
|
||||||
|
|
||||||
#include "libavutil/version.h"
|
#include "libavutil/version.h"
|
||||||
|
|
||||||
#define LIBSWSCALE_VERSION_MAJOR 4
|
#define LIBSWSCALE_VERSION_MAJOR 5
|
||||||
#define LIBSWSCALE_VERSION_MINOR 9
|
#define LIBSWSCALE_VERSION_MINOR 0
|
||||||
#define LIBSWSCALE_VERSION_MICRO 100
|
#define LIBSWSCALE_VERSION_MICRO 100
|
||||||
|
|
||||||
#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
|
#define LIBSWSCALE_VERSION_INT AV_VERSION_INT(LIBSWSCALE_VERSION_MAJOR, \
|
||||||
|
|
|
@ -3,7 +3,6 @@ stream=0, decode=0
|
||||||
ab=0
|
ab=0
|
||||||
bt=4000000
|
bt=4000000
|
||||||
flags=0x00000000
|
flags=0x00000000
|
||||||
me_method=5
|
|
||||||
time_base=0/1
|
time_base=0/1
|
||||||
g=12
|
g=12
|
||||||
ar=0
|
ar=0
|
||||||
|
@ -18,7 +17,6 @@ stream=0, decode=0
|
||||||
qdiff=3
|
qdiff=3
|
||||||
bf=0
|
bf=0
|
||||||
b_qfactor=1.250000
|
b_qfactor=1.250000
|
||||||
rc_strategy=0
|
|
||||||
b_strategy=0
|
b_strategy=0
|
||||||
ps=0
|
ps=0
|
||||||
mv_bits=0
|
mv_bits=0
|
||||||
|
@ -38,18 +36,12 @@ stream=0, decode=0
|
||||||
has_b_frames=0
|
has_b_frames=0
|
||||||
block_align=0
|
block_align=0
|
||||||
mpeg_quant=0
|
mpeg_quant=0
|
||||||
qsquish=0.000000
|
|
||||||
rc_qmod_amp=0.000000
|
|
||||||
rc_qmod_freq=0
|
|
||||||
rc_override_count=0
|
rc_override_count=0
|
||||||
rc_eq=
|
|
||||||
maxrate=0
|
maxrate=0
|
||||||
minrate=0
|
minrate=0
|
||||||
bufsize=0
|
bufsize=0
|
||||||
rc_buf_aggressivity=1.000000
|
|
||||||
i_qfactor=-0.800000
|
i_qfactor=-0.800000
|
||||||
i_qoffset=0.000000
|
i_qoffset=0.000000
|
||||||
rc_init_cplx=0.000000
|
|
||||||
dct=0
|
dct=0
|
||||||
lumi_mask=0.000000
|
lumi_mask=0.000000
|
||||||
tcplx_mask=0.000000
|
tcplx_mask=0.000000
|
||||||
|
@ -64,7 +56,6 @@ stream=0, decode=0
|
||||||
aspect=180/180
|
aspect=180/180
|
||||||
sar=180/180
|
sar=180/180
|
||||||
debug=0x00000000
|
debug=0x00000000
|
||||||
vismv=0x00000000
|
|
||||||
cmp=0
|
cmp=0
|
||||||
subcmp=0
|
subcmp=0
|
||||||
mbcmp=0
|
mbcmp=0
|
||||||
|
@ -75,27 +66,17 @@ stream=0, decode=0
|
||||||
precmp=0
|
precmp=0
|
||||||
pre_dia_size=0
|
pre_dia_size=0
|
||||||
subq=8
|
subq=8
|
||||||
dtg_active_format=0
|
|
||||||
me_range=0
|
me_range=0
|
||||||
ibias=999999
|
|
||||||
pbias=999999
|
|
||||||
global_quality=0
|
global_quality=0
|
||||||
coder=0
|
coder=0
|
||||||
context=0
|
context=0
|
||||||
slice_flags=0
|
slice_flags=0
|
||||||
xvmc_acceleration=0
|
|
||||||
mbd=0
|
mbd=0
|
||||||
stream_codec_tag=0
|
|
||||||
sc_threshold=0
|
sc_threshold=0
|
||||||
lmin=0
|
|
||||||
lmax=0
|
|
||||||
nr=0
|
nr=0
|
||||||
rc_init_occupancy=0
|
rc_init_occupancy=0
|
||||||
flags2=0x00000000
|
flags2=0x00000000
|
||||||
error=0
|
|
||||||
threads=1
|
threads=1
|
||||||
me_threshold=0
|
|
||||||
mb_threshold=0
|
|
||||||
dc=0
|
dc=0
|
||||||
nssew=8
|
nssew=8
|
||||||
skip_top=0
|
skip_top=0
|
||||||
|
@ -107,7 +88,6 @@ stream=0, decode=0
|
||||||
skip_factor=0
|
skip_factor=0
|
||||||
skip_exp=0
|
skip_exp=0
|
||||||
skipcmp=13
|
skipcmp=13
|
||||||
border_mask=0.000000
|
|
||||||
mblmin=236
|
mblmin=236
|
||||||
mblmax=3658
|
mblmax=3658
|
||||||
mepc=256
|
mepc=256
|
||||||
|
@ -120,7 +100,6 @@ stream=0, decode=0
|
||||||
refs=1
|
refs=1
|
||||||
chromaoffset=0
|
chromaoffset=0
|
||||||
trellis=0
|
trellis=0
|
||||||
sc_factor=6
|
|
||||||
mv0_threshold=256
|
mv0_threshold=256
|
||||||
b_sensitivity=40
|
b_sensitivity=40
|
||||||
compression_level=-1
|
compression_level=-1
|
||||||
|
@ -163,7 +142,6 @@ stream=0, decode=1
|
||||||
ab=0
|
ab=0
|
||||||
bt=4000000
|
bt=4000000
|
||||||
flags=0x00000000
|
flags=0x00000000
|
||||||
me_method=5
|
|
||||||
time_base=0/1
|
time_base=0/1
|
||||||
g=12
|
g=12
|
||||||
ar=0
|
ar=0
|
||||||
|
@ -178,7 +156,6 @@ stream=0, decode=1
|
||||||
qdiff=3
|
qdiff=3
|
||||||
bf=0
|
bf=0
|
||||||
b_qfactor=1.250000
|
b_qfactor=1.250000
|
||||||
rc_strategy=0
|
|
||||||
b_strategy=0
|
b_strategy=0
|
||||||
ps=0
|
ps=0
|
||||||
mv_bits=0
|
mv_bits=0
|
||||||
|
@ -198,18 +175,12 @@ stream=0, decode=1
|
||||||
has_b_frames=0
|
has_b_frames=0
|
||||||
block_align=0
|
block_align=0
|
||||||
mpeg_quant=0
|
mpeg_quant=0
|
||||||
qsquish=0.000000
|
|
||||||
rc_qmod_amp=0.000000
|
|
||||||
rc_qmod_freq=0
|
|
||||||
rc_override_count=0
|
rc_override_count=0
|
||||||
rc_eq=
|
|
||||||
maxrate=0
|
maxrate=0
|
||||||
minrate=0
|
minrate=0
|
||||||
bufsize=0
|
bufsize=0
|
||||||
rc_buf_aggressivity=1.000000
|
|
||||||
i_qfactor=-0.800000
|
i_qfactor=-0.800000
|
||||||
i_qoffset=0.000000
|
i_qoffset=0.000000
|
||||||
rc_init_cplx=0.000000
|
|
||||||
dct=0
|
dct=0
|
||||||
lumi_mask=0.000000
|
lumi_mask=0.000000
|
||||||
tcplx_mask=0.000000
|
tcplx_mask=0.000000
|
||||||
|
@ -224,7 +195,6 @@ stream=0, decode=1
|
||||||
aspect=180/180
|
aspect=180/180
|
||||||
sar=180/180
|
sar=180/180
|
||||||
debug=0x00000000
|
debug=0x00000000
|
||||||
vismv=0x00000000
|
|
||||||
cmp=0
|
cmp=0
|
||||||
subcmp=0
|
subcmp=0
|
||||||
mbcmp=0
|
mbcmp=0
|
||||||
|
@ -235,27 +205,17 @@ stream=0, decode=1
|
||||||
precmp=0
|
precmp=0
|
||||||
pre_dia_size=0
|
pre_dia_size=0
|
||||||
subq=8
|
subq=8
|
||||||
dtg_active_format=0
|
|
||||||
me_range=0
|
me_range=0
|
||||||
ibias=999999
|
|
||||||
pbias=999999
|
|
||||||
global_quality=0
|
global_quality=0
|
||||||
coder=0
|
coder=0
|
||||||
context=0
|
context=0
|
||||||
slice_flags=0
|
slice_flags=0
|
||||||
xvmc_acceleration=0
|
|
||||||
mbd=0
|
mbd=0
|
||||||
stream_codec_tag=0
|
|
||||||
sc_threshold=0
|
sc_threshold=0
|
||||||
lmin=0
|
|
||||||
lmax=0
|
|
||||||
nr=0
|
nr=0
|
||||||
rc_init_occupancy=0
|
rc_init_occupancy=0
|
||||||
flags2=0x00000000
|
flags2=0x00000000
|
||||||
error=0
|
|
||||||
threads=1
|
threads=1
|
||||||
me_threshold=0
|
|
||||||
mb_threshold=0
|
|
||||||
dc=0
|
dc=0
|
||||||
nssew=8
|
nssew=8
|
||||||
skip_top=0
|
skip_top=0
|
||||||
|
@ -267,7 +227,6 @@ stream=0, decode=1
|
||||||
skip_factor=0
|
skip_factor=0
|
||||||
skip_exp=0
|
skip_exp=0
|
||||||
skipcmp=13
|
skipcmp=13
|
||||||
border_mask=0.000000
|
|
||||||
mblmin=236
|
mblmin=236
|
||||||
mblmax=3658
|
mblmax=3658
|
||||||
mepc=256
|
mepc=256
|
||||||
|
@ -280,7 +239,6 @@ stream=0, decode=1
|
||||||
refs=1
|
refs=1
|
||||||
chromaoffset=0
|
chromaoffset=0
|
||||||
trellis=0
|
trellis=0
|
||||||
sc_factor=6
|
|
||||||
mv0_threshold=256
|
mv0_threshold=256
|
||||||
b_sensitivity=40
|
b_sensitivity=40
|
||||||
compression_level=-1
|
compression_level=-1
|
||||||
|
|
|
@ -3,7 +3,6 @@ stream=0, decode=0
|
||||||
ab=0
|
ab=0
|
||||||
bt=4000000
|
bt=4000000
|
||||||
flags=0x00000000
|
flags=0x00000000
|
||||||
me_method=5
|
|
||||||
time_base=0/1
|
time_base=0/1
|
||||||
g=12
|
g=12
|
||||||
ar=0
|
ar=0
|
||||||
|
@ -18,7 +17,6 @@ stream=0, decode=0
|
||||||
qdiff=3
|
qdiff=3
|
||||||
bf=0
|
bf=0
|
||||||
b_qfactor=1.250000
|
b_qfactor=1.250000
|
||||||
rc_strategy=0
|
|
||||||
b_strategy=0
|
b_strategy=0
|
||||||
ps=0
|
ps=0
|
||||||
mv_bits=0
|
mv_bits=0
|
||||||
|
@ -38,18 +36,12 @@ stream=0, decode=0
|
||||||
has_b_frames=0
|
has_b_frames=0
|
||||||
block_align=0
|
block_align=0
|
||||||
mpeg_quant=0
|
mpeg_quant=0
|
||||||
qsquish=0.000000
|
|
||||||
rc_qmod_amp=0.000000
|
|
||||||
rc_qmod_freq=0
|
|
||||||
rc_override_count=0
|
rc_override_count=0
|
||||||
rc_eq=
|
|
||||||
maxrate=0
|
maxrate=0
|
||||||
minrate=0
|
minrate=0
|
||||||
bufsize=0
|
bufsize=0
|
||||||
rc_buf_aggressivity=1.000000
|
|
||||||
i_qfactor=-0.800000
|
i_qfactor=-0.800000
|
||||||
i_qoffset=0.000000
|
i_qoffset=0.000000
|
||||||
rc_init_cplx=0.000000
|
|
||||||
dct=0
|
dct=0
|
||||||
lumi_mask=0.000000
|
lumi_mask=0.000000
|
||||||
tcplx_mask=0.000000
|
tcplx_mask=0.000000
|
||||||
|
@ -64,7 +56,6 @@ stream=0, decode=0
|
||||||
aspect=2835/2835
|
aspect=2835/2835
|
||||||
sar=2835/2835
|
sar=2835/2835
|
||||||
debug=0x00000000
|
debug=0x00000000
|
||||||
vismv=0x00000000
|
|
||||||
cmp=0
|
cmp=0
|
||||||
subcmp=0
|
subcmp=0
|
||||||
mbcmp=0
|
mbcmp=0
|
||||||
|
@ -75,27 +66,17 @@ stream=0, decode=0
|
||||||
precmp=0
|
precmp=0
|
||||||
pre_dia_size=0
|
pre_dia_size=0
|
||||||
subq=8
|
subq=8
|
||||||
dtg_active_format=0
|
|
||||||
me_range=0
|
me_range=0
|
||||||
ibias=999999
|
|
||||||
pbias=999999
|
|
||||||
global_quality=0
|
global_quality=0
|
||||||
coder=0
|
coder=0
|
||||||
context=0
|
context=0
|
||||||
slice_flags=0
|
slice_flags=0
|
||||||
xvmc_acceleration=0
|
|
||||||
mbd=0
|
mbd=0
|
||||||
stream_codec_tag=0
|
|
||||||
sc_threshold=0
|
sc_threshold=0
|
||||||
lmin=0
|
|
||||||
lmax=0
|
|
||||||
nr=0
|
nr=0
|
||||||
rc_init_occupancy=0
|
rc_init_occupancy=0
|
||||||
flags2=0x00000000
|
flags2=0x00000000
|
||||||
error=0
|
|
||||||
threads=1
|
threads=1
|
||||||
me_threshold=0
|
|
||||||
mb_threshold=0
|
|
||||||
dc=0
|
dc=0
|
||||||
nssew=8
|
nssew=8
|
||||||
skip_top=0
|
skip_top=0
|
||||||
|
@ -107,7 +88,6 @@ stream=0, decode=0
|
||||||
skip_factor=0
|
skip_factor=0
|
||||||
skip_exp=0
|
skip_exp=0
|
||||||
skipcmp=13
|
skipcmp=13
|
||||||
border_mask=0.000000
|
|
||||||
mblmin=236
|
mblmin=236
|
||||||
mblmax=3658
|
mblmax=3658
|
||||||
mepc=256
|
mepc=256
|
||||||
|
@ -120,7 +100,6 @@ stream=0, decode=0
|
||||||
refs=1
|
refs=1
|
||||||
chromaoffset=0
|
chromaoffset=0
|
||||||
trellis=0
|
trellis=0
|
||||||
sc_factor=6
|
|
||||||
mv0_threshold=256
|
mv0_threshold=256
|
||||||
b_sensitivity=40
|
b_sensitivity=40
|
||||||
compression_level=-1
|
compression_level=-1
|
||||||
|
@ -163,7 +142,6 @@ stream=0, decode=1
|
||||||
ab=0
|
ab=0
|
||||||
bt=4000000
|
bt=4000000
|
||||||
flags=0x00000000
|
flags=0x00000000
|
||||||
me_method=5
|
|
||||||
time_base=0/1
|
time_base=0/1
|
||||||
g=12
|
g=12
|
||||||
ar=0
|
ar=0
|
||||||
|
@ -178,7 +156,6 @@ stream=0, decode=1
|
||||||
qdiff=3
|
qdiff=3
|
||||||
bf=0
|
bf=0
|
||||||
b_qfactor=1.250000
|
b_qfactor=1.250000
|
||||||
rc_strategy=0
|
|
||||||
b_strategy=0
|
b_strategy=0
|
||||||
ps=0
|
ps=0
|
||||||
mv_bits=0
|
mv_bits=0
|
||||||
|
@ -198,18 +175,12 @@ stream=0, decode=1
|
||||||
has_b_frames=0
|
has_b_frames=0
|
||||||
block_align=0
|
block_align=0
|
||||||
mpeg_quant=0
|
mpeg_quant=0
|
||||||
qsquish=0.000000
|
|
||||||
rc_qmod_amp=0.000000
|
|
||||||
rc_qmod_freq=0
|
|
||||||
rc_override_count=0
|
rc_override_count=0
|
||||||
rc_eq=
|
|
||||||
maxrate=0
|
maxrate=0
|
||||||
minrate=0
|
minrate=0
|
||||||
bufsize=0
|
bufsize=0
|
||||||
rc_buf_aggressivity=1.000000
|
|
||||||
i_qfactor=-0.800000
|
i_qfactor=-0.800000
|
||||||
i_qoffset=0.000000
|
i_qoffset=0.000000
|
||||||
rc_init_cplx=0.000000
|
|
||||||
dct=0
|
dct=0
|
||||||
lumi_mask=0.000000
|
lumi_mask=0.000000
|
||||||
tcplx_mask=0.000000
|
tcplx_mask=0.000000
|
||||||
|
@ -224,7 +195,6 @@ stream=0, decode=1
|
||||||
aspect=2835/2835
|
aspect=2835/2835
|
||||||
sar=2835/2835
|
sar=2835/2835
|
||||||
debug=0x00000000
|
debug=0x00000000
|
||||||
vismv=0x00000000
|
|
||||||
cmp=0
|
cmp=0
|
||||||
subcmp=0
|
subcmp=0
|
||||||
mbcmp=0
|
mbcmp=0
|
||||||
|
@ -235,27 +205,17 @@ stream=0, decode=1
|
||||||
precmp=0
|
precmp=0
|
||||||
pre_dia_size=0
|
pre_dia_size=0
|
||||||
subq=8
|
subq=8
|
||||||
dtg_active_format=0
|
|
||||||
me_range=0
|
me_range=0
|
||||||
ibias=999999
|
|
||||||
pbias=999999
|
|
||||||
global_quality=0
|
global_quality=0
|
||||||
coder=0
|
coder=0
|
||||||
context=0
|
context=0
|
||||||
slice_flags=0
|
slice_flags=0
|
||||||
xvmc_acceleration=0
|
|
||||||
mbd=0
|
mbd=0
|
||||||
stream_codec_tag=0
|
|
||||||
sc_threshold=0
|
sc_threshold=0
|
||||||
lmin=0
|
|
||||||
lmax=0
|
|
||||||
nr=0
|
nr=0
|
||||||
rc_init_occupancy=0
|
rc_init_occupancy=0
|
||||||
flags2=0x00000000
|
flags2=0x00000000
|
||||||
error=0
|
|
||||||
threads=1
|
threads=1
|
||||||
me_threshold=0
|
|
||||||
mb_threshold=0
|
|
||||||
dc=0
|
dc=0
|
||||||
nssew=8
|
nssew=8
|
||||||
skip_top=0
|
skip_top=0
|
||||||
|
@ -267,7 +227,6 @@ stream=0, decode=1
|
||||||
skip_factor=0
|
skip_factor=0
|
||||||
skip_exp=0
|
skip_exp=0
|
||||||
skipcmp=13
|
skipcmp=13
|
||||||
border_mask=0.000000
|
|
||||||
mblmin=236
|
mblmin=236
|
||||||
mblmax=3658
|
mblmax=3658
|
||||||
mepc=256
|
mepc=256
|
||||||
|
@ -280,7 +239,6 @@ stream=0, decode=1
|
||||||
refs=1
|
refs=1
|
||||||
chromaoffset=0
|
chromaoffset=0
|
||||||
trellis=0
|
trellis=0
|
||||||
sc_factor=6
|
|
||||||
mv0_threshold=256
|
mv0_threshold=256
|
||||||
b_sensitivity=40
|
b_sensitivity=40
|
||||||
compression_level=-1
|
compression_level=-1
|
||||||
|
|
Loading…
Reference in New Issue