diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 20:42:28 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-22 20:48:54 +0200 |
| commit | 470204218f37e361da02d75845f9db9793a4ee53 (patch) | |
| tree | ba86e91f6b2c0a35192e4c04ab7182cadb5d3699 /libavcodec/pnm_parser.c | |
| parent | 4c46f1d493f4d68121526fbede459619a02afa5a (diff) | |
| parent | f890677d05bc4e8b494a73373ab4cc19791bf884 (diff) | |
| download | ffmpeg-470204218f37e361da02d75845f9db9793a4ee53.tar.gz | |
Merge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'
* commit 'f890677d05bc4e8b494a73373ab4cc19791bf884':
Replace any remaining avpicture function with imgutils
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavcodec/pnm_parser.c')
| -rw-r--r-- | libavcodec/pnm_parser.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/pnm_parser.c b/libavcodec/pnm_parser.c index a5eb81f5f6..a7d70b9931 100644 --- a/libavcodec/pnm_parser.c +++ b/libavcodec/pnm_parser.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils.h" + #include "parser.h" //for ParseContext #include "pnm.h" @@ -66,7 +68,7 @@ retry: next = END_NOT_FOUND; } else { next = pnmctx.bytestream - pnmctx.bytestream_start - + avpicture_get_size(avctx->pix_fmt, avctx->width, avctx->height); + + av_image_get_buffer_size(avctx->pix_fmt, avctx->width, avctx->height, 1); if (pnmctx.bytestream_start != buf) next -= pc->index; if (next > buf_size) |