diff options
| author | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-10-14 11:33:24 +0200 |
|---|---|---|
| committer | Vittorio Giovara <vittorio.giovara@gmail.com> | 2015-10-21 11:59:59 +0200 |
| commit | f890677d05bc4e8b494a73373ab4cc19791bf884 (patch) | |
| tree | cb66705498706dc94caa00ae80962f770a7ba056 /libavdevice | |
| parent | 13bddab7de10aebf6efb98aa6d7ff0c51bb0e364 (diff) | |
| download | ffmpeg-f890677d05bc4e8b494a73373ab4cc19791bf884.tar.gz | |
Replace any remaining avpicture function with imgutils
avpicture_get_size() -> av_image_get_buffer_size()
Signed-off-by: Vittorio Giovara <vittorio.giovara@gmail.com>
Diffstat (limited to 'libavdevice')
| -rw-r--r-- | libavdevice/libdc1394.c | 4 | ||||
| -rw-r--r-- | libavdevice/v4l2.c | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavdevice/libdc1394.c b/libavdevice/libdc1394.c index 20696f58fc..64c453bd9a 100644 --- a/libavdevice/libdc1394.c +++ b/libavdevice/libdc1394.c @@ -41,6 +41,7 @@ #define DC1394_FRAMERATE_240 FRAMERATE_240 #endif +#include "libavutil/imgutils.h" #include "libavutil/internal.h" #include "libavutil/log.h" #include "libavutil/mathematics.h" @@ -179,7 +180,8 @@ static inline int dc1394_read_common(AVFormatContext *c, /* packet init */ av_init_packet(&dc1394->packet); - dc1394->packet.size = avpicture_get_size(fmt->pix_fmt, fmt->width, fmt->height); + dc1394->packet.size = av_image_get_buffer_size(fmt->pix_fmt, + fmt->width, fmt->height, 1); dc1394->packet.stream_index = vst->index; dc1394->packet.flags |= AV_PKT_FLAG_KEY; diff --git a/libavdevice/v4l2.c b/libavdevice/v4l2.c index 7b3568224f..40eabc4f21 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -828,8 +828,8 @@ static int v4l2_read_header(AVFormatContext *s1) return res; st->codec->pix_fmt = fmt_v4l2ff(desired_format, codec_id); - s->frame_size = - avpicture_get_size(st->codec->pix_fmt, s->width, s->height); + s->frame_size = av_image_get_buffer_size(st->codec->pix_fmt, + s->width, s->height, 1); if ((res = mmap_init(s1)) || (res = mmap_start(s1)) < 0) { |