summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorStefano Sabatini <stefasab@gmail.com>2014-06-09 19:32:37 +0200
committerStefano Sabatini <stefasab@gmail.com>2014-06-20 12:12:46 +0200
commitd381109ce8acd84fc16d3dfc4f8f688462d45366 (patch)
tree17a9e1bd78e073942e72c3c78c431333f4f84056 /libavcodec
parent8c443767995db7905282239f2a467a995609a6ff (diff)
downloadffmpeg-d381109ce8acd84fc16d3dfc4f8f688462d45366.tar.gz
lavc/h264_slice: clarify informational message in case of disabled slice multi-threaded decoding
Also suggest what can be done to workaround the limitation.
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/h264_slice.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/libavcodec/h264_slice.c b/libavcodec/h264_slice.c
index a0288e0f85..e6645e8dc9 100644
--- a/libavcodec/h264_slice.c
+++ b/libavcodec/h264_slice.c
@@ -1884,7 +1884,10 @@ int ff_h264_decode_slice_header(H264Context *h, H264Context *h0)
h0->max_contexts = 1;
if (!h0->single_decode_warning) {
av_log(h->avctx, AV_LOG_INFO,
- "Cannot parallelize deblocking type 1, decoding such frames in sequential order\n");
+ "Cannot parallelize slice decoding with deblocking filter type 1, decoding such frames in sequential order\n"
+ "To parallelize slice decoding you need video encoded with disable_deblocking_filter_idc set to 2 (deblock only edges that do not cross slices).\n"
+ "Setting the flags2 libavcodec option to +fast (-flags2 +fast) will disable deblocking across slices and enable parallel slice decoding "
+ "but will generate non-standard-compliant output.\n");
h0->single_decode_warning = 1;
}
if (h != h0) {