diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 03:48:15 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-19 03:56:53 +0100 |
| commit | 56e122787e7362274b7ac342fde6e303259a5f57 (patch) | |
| tree | 6b87895ea4cc938fea927e5e27ceed77c9519e6a /libavcodec/pthread_frame.c | |
| parent | f0f04fd8429475999bde08943e29a678cab3926e (diff) | |
| parent | a553c6a347d3d28d7ee44c3df3d5c4ee780dba23 (diff) | |
Merge commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23'
* commit 'a553c6a347d3d28d7ee44c3df3d5c4ee780dba23':
lavc: use buf[0] instead of data[0] in checks whether a frame is allocated
Conflicts:
libavcodec/h264_refs.c
libavcodec/mpegvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pthread_frame.c')
| -rw-r--r-- | libavcodec/pthread_frame.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/pthread_frame.c b/libavcodec/pthread_frame.c index cfbc9643ee..4f9d68b77b 100644 --- a/libavcodec/pthread_frame.c +++ b/libavcodec/pthread_frame.c @@ -853,7 +853,7 @@ FF_DISABLE_DEPRECATION_WARNINGS avctx->get_buffer2 == avcodec_default_get_buffer2); FF_ENABLE_DEPRECATION_WARNINGS - if (!f->f->data[0]) + if (!f->f->buf[0]) return; if (avctx->debug & FF_DEBUG_BUFFERS) |