virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-21 10:55:51 +02:00
Code Issues Releases Activity

Move aspect ratio 0/0 avoidance code so the values in the sps struct are not missed.

Browse Source 
This preempts issues with av_cmp_q(0/0, X)

Originally committed as revision 25337 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-10-05 01:43:25 +00:00
parent c9b8762856
commit cfa5a81ea6
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/h264.c
View File

@ -38,6 +38,7 @@
#include "mathops.h"
#include "rectangle.h"
#include "vdpau_internal.h"
#include "libavutil/avassert.h"
#include "cabac.h"
@ -1826,8 +1827,7 @@ static int decode_slice_header(H264Context *h, H264Context *h0){
avcodec_set_dimensions(s->avctx, s->width, s->height);
s->avctx->sample_aspect_ratio= h->sps.sar;
if(!s->avctx->sample_aspect_ratio.den)
s->avctx->sample_aspect_ratio.den = 1;
av_assert0(s->avctx->sample_aspect_ratio.den);
if(h->sps.video_signal_type_present_flag){
s->avctx->color_range = h->sps.full_range ? AVCOL_RANGE_JPEG : AVCOL_RANGE_MPEG;

3
libavcodec/h264_ps.c
View File

@ -387,6 +387,9 @@ int ff_h264_decode_seq_parameter_set(H264Context *h){
if (decode_vui_parameters(h, sps) < 0)
goto fail;
if(!sps->sar.den)
sps->sar.den= 1;
if(s->avctx->debug&FF_DEBUG_PICT_INFO){
av_log(h->s.avctx, AV_LOG_DEBUG, "sps:%u profile:%d/%d poc:%d ref:%d %dx%d %s %s crop:%d/%d/%d/%d %s %s %d/%d\n",
sps_id, sps->profile_idc, sps->level_idc,