summaryrefslogtreecommitdiffstats
path: root/ffplay.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2012-01-21 23:11:27 +0100
committerMichael Niedermayer <michaelni@gmx.at>2012-01-21 23:11:27 +0100
commitb5a69e79c579e6e15e2019ffd34ef0e09aeab586 (patch)
treebc6b0aa0776ca51a9b8a4800a7f464866221821f /ffplay.c
parent9e53f62be1a171eaf9620958c225d42cf5142a30 (diff)
parentad7beb2cac1563e87171a4d044a6d526527d81d9 (diff)
downloadffmpeg-streaming-b5a69e79c579e6e15e2019ffd34ef0e09aeab586.zip
ffmpeg-streaming-b5a69e79c579e6e15e2019ffd34ef0e09aeab586.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: rtpdec: Use our own SSRC in the SDES field when sending RRs Finalize changelog for 0.8 Release Prepare for 0.8 Release threads: change the default for threads back to 1 threads: update slice_count and slice_offset from user context aviocat: Remove useless includes doc/APIChanges: fill in missing dates and hashes Revert "avserver: fix build after the next bump." mpegaudiodec: switch error detection check to AV_EF_BUFFER lavf: rename fer option and document resulting (f_)err_detect options lavc: rename err_filter option to err_detect and document it mpegvideo: fix invalid memory access for small video dimensions movenc: Reorder entries in the MOVIentry struct, for tigheter packing rtsp: Remove extern declarations for variables that don't exist aviocat: Flush the output before closing Conflicts: Changelog RELEASE libavcodec/mpegaudiodec.c libavcodec/pthread.c libavformat/options.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffplay.c')
-rw-r--r--ffplay.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/ffplay.c b/ffplay.c
index 4fd8b36..babdcb9 100644
--- a/ffplay.c
+++ b/ffplay.c
@@ -2266,6 +2266,8 @@ static int stream_component_open(VideoState *is, int stream_index)
}
}
+ if (!av_dict_get(opts, "threads", NULL, 0))
+ av_dict_set(&opts, "threads", "auto", 0);
if (!codec ||
avcodec_open2(avctx, codec, &opts) < 0)
return -1;
OpenPOWER on IntegriCloud