summaryrefslogtreecommitdiff
path: root/libavcodec/h264.c
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2013-04-07 10:17:09 +0200
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2013-04-15 09:04:07 +0200
commitc10d498bfd246a40cc7830838b74e18a79418839 (patch)
treec25fb041eefb1df030268b6bd517b415f7b1f1c8 /libavcodec/h264.c
parent8067f55edf3719182aed6e5b57b7863889f80218 (diff)
Add thread-safe wrapper for get_format().
Just like get_buffer, get_format should not be called from a different thread if thread_safe_callbacks is not set. Signed-off-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Diffstat (limited to 'libavcodec/h264.c')
-rw-r--r--libavcodec/h264.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index b4df424f5b..e5bab1b7b6 100644
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -3043,7 +3043,7 @@ static enum AVPixelFormat get_pixel_format(H264Context *h, int force_callback)
for (i=0; fmt[i] != AV_PIX_FMT_NONE; i++)
if (fmt[i] == h->avctx->pix_fmt && !force_callback)
return fmt[i];
- return h->avctx->get_format(h->avctx, fmt);
+ return ff_thread_get_format(h->avctx, fmt);
}
break;
default: