Changeset 0dceefc5 in ffmpeg

Timestamp:

Jun 20, 2014, 8:20:28 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

fe43facd

Parents:

329898aa (diff), 9e500efd (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'

• commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2': Add av_image_check_sar() and use it to validate SAR

Conflicts:

libavcodec/dpx.c
libavcodec/dvdec.c
libavcodec/ffv1dec.c
libavcodec/utils.c
libavutil/version.h

Merged-by: Michael Niedermayer <​michaelni@gmx.at>

(No files)