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 /libavformat/yuv4mpegdec.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 'libavformat/yuv4mpegdec.c')
| -rw-r--r-- | libavformat/yuv4mpegdec.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/yuv4mpegdec.c b/libavformat/yuv4mpegdec.c index 0db42f5933..ea1ae25599 100644 --- a/libavformat/yuv4mpegdec.c +++ b/libavformat/yuv4mpegdec.c @@ -19,6 +19,8 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "libavutil/imgutils.h" + #include "avformat.h" #include "internal.h" #include "yuv4mpeg.h" @@ -256,7 +258,7 @@ static int yuv4_read_header(AVFormatContext *s) st->sample_aspect_ratio = (AVRational){ aspectn, aspectd }; st->codec->chroma_sample_location = chroma_sample_location; st->codec->field_order = field_order; - s->packet_size = avpicture_get_size(st->codec->pix_fmt, width, height) + Y4M_FRAME_MAGIC_LEN; + s->packet_size = av_image_get_buffer_size(st->codec->pix_fmt, width, height, 1) + Y4M_FRAME_MAGIC_LEN; if ((int) s->packet_size < 0) return s->packet_size; s->internal->data_offset = avio_tell(pb); |