diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:43:24 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-06 15:44:11 +0100 |
| commit | 3328d105f76c21e5ca87471b8a8b51af9801dc17 (patch) | |
| tree | f3592304ee2db00ea2437d1105d39bff5c4d844f /libavcodec/utils.c | |
| parent | 76c63bc5d8567817c229adc6a6fcd9cbd902f0d8 (diff) | |
| parent | 50079a6aa93291e6dc9d9fb8d33da83f79e9311d (diff) | |
Merge commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d'
* commit '50079a6aa93291e6dc9d9fb8d33da83f79e9311d':
lavc: do not leak the internal frame if opening the codec fails
Conflicts:
libavcodec/utils.c
See: 8b285f03f70e884312c6c4e00a1377cfd85a3a7a
Merged-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 023ea1d557..4299a44b65 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1498,8 +1498,8 @@ free_and_end: av_dict_free(&tmp); av_freep(&avctx->priv_data); if (avctx->internal) { - av_freep(&avctx->internal->pool); av_frame_free(&avctx->internal->to_free); + av_freep(&avctx->internal->pool); } av_freep(&avctx->internal); avctx->codec = NULL; |