diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:47:10 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-28 12:47:10 +0100 |
| commit | 252f56636ca0fc1d5223d091b1d56f6a5ab2b8af (patch) | |
| tree | 499c8f42e24bedcadf8e88ab5af5f53a40d20293 | |
| parent | 84f972f9944ad29712c70f22bd55b2b12171abf8 (diff) | |
| parent | 97de206b44a48da726807cc3e7b9448a8112760b (diff) | |
| download | ffmpeg-252f56636ca0fc1d5223d091b1d56f6a5ab2b8af.tar.gz | |
Merge commit '97de206b44a48da726807cc3e7b9448a8112760b'
* commit '97de206b44a48da726807cc3e7b9448a8112760b':
lavc: disable CRC checking by default
Conflicts:
libavcodec/options_table.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavcodec/options_table.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/options_table.h b/libavcodec/options_table.h index c1a4ceb3a9..8912ff6c4e 100644 --- a/libavcodec/options_table.h +++ b/libavcodec/options_table.h @@ -144,7 +144,7 @@ static const AVOption avcodec_options[] = { {"unofficial", "allow unofficial extensions", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_UNOFFICIAL }, INT_MIN, INT_MAX, V|D|E, "strict"}, {"experimental", "allow non-standardized experimental things", 0, AV_OPT_TYPE_CONST, {.i64 = FF_COMPLIANCE_EXPERIMENTAL }, INT_MIN, INT_MAX, V|D|E, "strict"}, {"b_qoffset", "QP offset between P- and B-frames", OFFSET(b_quant_offset), AV_OPT_TYPE_FLOAT, {.dbl = 1.25 }, -FLT_MAX, FLT_MAX, V|E}, -{"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, +{"err_detect", "set error detection flags", OFFSET(err_recognition), AV_OPT_TYPE_FLAGS, {.i64 = 0 }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, {"crccheck", "verify embedded CRCs", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_CRCCHECK }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, {"bitstream", "detect bitstream specification deviations", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BITSTREAM }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, {"buffer", "detect improper bitstream length", 0, AV_OPT_TYPE_CONST, {.i64 = AV_EF_BUFFER }, INT_MIN, INT_MAX, A|V|D, "err_detect"}, |