github-mirrors/FFmpeg
1
0
Fork 0
mirror of https://mirror.skon.top/https://github.com/FFmpeg/FFmpeg synced 2026-04-20 21:00:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'f890677d05bc4e8b494a73373ab4cc19791bf884'

Browse Source 
* commit 'f890677d05bc4e8b494a73373ab4cc19791bf884':
  Replace any remaining avpicture function with imgutils

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2015-10-22 20:42:28 +02:00
parent 4c46f1d493 f890677d05
commit 470204218f
8 changed files with 24 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavdevice/libdc1394.c
View File

@@ -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;