diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:56:58 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-01-10 12:57:08 +0100 |
| commit | ac6e074fb711468a2ff3f241a1641dc5b34b386d (patch) | |
| tree | 3bf8ed5dfef4709e9a0112628f54dc5673892fe0 /libavformat/yuv4mpeg.c | |
| parent | 56ca871fb3d6c60a97ac678a919d8253fcb3ebdd (diff) | |
| parent | ed79093222ceb42f0c3a39095a69af0b32be5450 (diff) | |
Merge commit 'ed79093222ceb42f0c3a39095a69af0b32be5450'
* commit 'ed79093222ceb42f0c3a39095a69af0b32be5450':
rtpdec: Add a terminating null byte at the end of the SDES/CNAME
yuv4mpeg: do not use deprecated functions
oggdec: fix faulty cleanup prototype
idcin: return 0 from idcin_read_packet() on success.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/yuv4mpeg.c')
| -rw-r--r-- | libavformat/yuv4mpeg.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c index 9c9c7fa8fe..ff039bd37a 100644 --- a/libavformat/yuv4mpeg.c +++ b/libavformat/yuv4mpeg.c @@ -18,6 +18,8 @@ * License along with FFmpeg; if not, write to the Free Software * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ + +#include "libavutil/pixdesc.h" #include "avformat.h" #include "internal.h" #include "libavutil/pixdesc.h" @@ -211,8 +213,8 @@ static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt) if (st->codec->pix_fmt != AV_PIX_FMT_GRAY8 && st->codec->pix_fmt != AV_PIX_FMT_GRAY16) { // Adjust for smaller Cb and Cr planes - avcodec_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift, - &v_chroma_shift); + av_pix_fmt_get_chroma_sub_sample(st->codec->pix_fmt, &h_chroma_shift, + &v_chroma_shift); width >>= h_chroma_shift; height >>= v_chroma_shift; |