diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-23 23:43:20 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2008-08-23 23:43:20 +0000 |
| commit | 5972945197d44e8bde6a986b9cba2e8196cfbc9c (patch) | |
| tree | 94ba719e6f5efb53fc18d7eb38ccb96d25e7b194 /libavformat/nutdec.c | |
| parent | c30a4489b444020ef951c1f0583afd8679c07c78 (diff) | |
| download | ffmpeg-5972945197d44e8bde6a986b9cba2e8196cfbc9c.tar.gz | |
convert every muxer/demuxer to write/read sample_aspect_ratio from/to
the corresponding AVStream instead of AVCodecContext
Originally committed as revision 14933 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/nutdec.c')
| -rw-r--r-- | libavformat/nutdec.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavformat/nutdec.c b/libavformat/nutdec.c index 5dac94c4b9..cf41f62b56 100644 --- a/libavformat/nutdec.c +++ b/libavformat/nutdec.c @@ -350,10 +350,10 @@ static int decode_stream_header(NUTContext *nut){ if (st->codec->codec_type == CODEC_TYPE_VIDEO){ GET_V(st->codec->width , tmp > 0) GET_V(st->codec->height, tmp > 0) - st->codec->sample_aspect_ratio.num= ff_get_v(bc); - st->codec->sample_aspect_ratio.den= ff_get_v(bc); - if((!st->codec->sample_aspect_ratio.num) != (!st->codec->sample_aspect_ratio.den)){ - av_log(s, AV_LOG_ERROR, "invalid aspect ratio %d/%d\n", st->codec->sample_aspect_ratio.num, st->codec->sample_aspect_ratio.den); + st->sample_aspect_ratio.num= ff_get_v(bc); + st->sample_aspect_ratio.den= ff_get_v(bc); + if((!st->sample_aspect_ratio.num) != (!st->sample_aspect_ratio.den)){ + av_log(s, AV_LOG_ERROR, "invalid aspect ratio %d/%d\n", st->sample_aspect_ratio.num, st->sample_aspect_ratio.den); return -1; } ff_get_v(bc); /* csp type */ |