apps/ffmpeg-rockchip
1
0
Fork 0
mirror of https://github.com/nyanmisaka/ffmpeg-rockchip.git synced 2025-10-16 22:01:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '9e500efdbe0deeff1602500ebc229a0a6b6bb1a2'

Browse Source 
* 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>
This commit is contained in:
Michael Niedermayer
2014-06-20 22:20:28 +02:00
parent 329898aa45 9e500efdbe
commit 0dceefc5fa
19 changed files with 120 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264_slice.c
View File

@@ -1150,8 +1150,7 @@ static int h264_slice_header_init(H264Context *h, int reinit)
h->avctx->thread_count : 1;
int i, ret;
h->avctx->sample_aspect_ratio = h->sps.sar;
av_assert0(h->avctx->sample_aspect_ratio.den);
ff_set_sar(h->avctx, h->sps.sar);
av_pix_fmt_get_chroma_sub_sample(h->avctx->pix_fmt,
&h->chroma_x_shift, &h->chroma_y_shift);