diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 02:00:12 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-12-06 02:52:46 +0100 |
| commit | 2dec950f49049b55a4d4147673824dc817cb27e5 (patch) | |
| tree | 5b9499346b00f2f6ad688b4e7b42f71a744ec24b /libavcodec/utils.c | |
| parent | 0393cf15dbe3b136647b81676a105815924eebcd (diff) | |
| download | android_external_ffmpeg-2dec950f49049b55a4d4147673824dc817cb27e5.tar.gz android_external_ffmpeg-2dec950f49049b55a4d4147673824dc817cb27e5.tar.bz2 android_external_ffmpeg-2dec950f49049b55a4d4147673824dc817cb27e5.zip | |
avcodec_open: if obtaining a lock fails, dont attempt to unlock it.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index fc56d69b31..131c156a6c 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -803,7 +803,7 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code ret = ff_lock_avcodec(avctx); if (ret < 0) - goto end; + return ret; avctx->internal = av_mallocz(sizeof(AVCodecInternal)); if (!avctx->internal) { |