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 /libavdevice | |
| parent | 4c46f1d493f4d68121526fbede459619a02afa5a (diff) | |
| parent | f890677d05bc4e8b494a73373ab4cc19791bf884 (diff) | |
| download | ffmpeg-streaming-470204218f37e361da02d75845f9db9793a4ee53.zip ffmpeg-streaming-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 '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 d5bbc7c..dcdca60 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" @@ -180,7 +181,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 9e8ba1e..247b287 100644 --- a/libavdevice/v4l2.c +++ b/libavdevice/v4l2.c @@ -939,8 +939,8 @@ static int v4l2_read_header(AVFormatContext *ctx) goto fail; st->codec->pix_fmt = ff_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(ctx)) || (res = mmap_start(ctx)) < 0) |
