virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-24 13:56:33 +02:00
Code Issues Releases Activity

Cleanup aspect_to_info().

Browse Source 
Originally committed as revision 21048 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2010-01-07 03:58:12 +00:00
parent 214cb565c0
commit f016159416
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libavcodec/h263.c
View File

@ -151,19 +151,18 @@ static void show_pict_info(MpegEncContext *s){
#if CONFIG_ENCODERS #if CONFIG_ENCODERS
static void aspect_to_info(MpegEncContext * s, AVRational aspect){ static av_const int aspect_to_info(AVRational aspect){
int i; int i;
if(aspect.num==0) aspect= (AVRational){1,1}; if(aspect.num==0) aspect= (AVRational){1,1};
for(i=1; i<6; i++){ for(i=1; i<6; i++){
if(av_cmp_q(pixel_aspect[i], aspect) == 0){ if(av_cmp_q(pixel_aspect[i], aspect) == 0){
s->aspect_ratio_info=i; return i;
return;
} }
} }
s->aspect_ratio_info= FF_ASPECT_EXTENDED; return FF_ASPECT_EXTENDED;
} }
void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number) void ff_flv_encode_picture_header(MpegEncContext * s, int picture_number)
@ -304,7 +303,7 @@ void h263_encode_picture_header(MpegEncContext * s, int picture_number)
if (format == 7) { if (format == 7) {
/* Custom Picture Format (CPFMT) */ /* Custom Picture Format (CPFMT) */
aspect_to_info(s, s->avctx->sample_aspect_ratio); s->aspect_ratio_info= aspect_to_info(s->avctx->sample_aspect_ratio);
put_bits(&s->pb,4,s->aspect_ratio_info); put_bits(&s->pb,4,s->aspect_ratio_info);
put_bits(&s->pb,9,(s->width >> 2) - 1); put_bits(&s->pb,9,(s->width >> 2) - 1);
@ -2308,7 +2307,7 @@ static void mpeg4_encode_vol_header(MpegEncContext * s, int vo_number, int vol_n
put_bits(&s->pb, 3, 1); /* is obj layer priority */ put_bits(&s->pb, 3, 1); /* is obj layer priority */
} }
aspect_to_info(s, s->avctx->sample_aspect_ratio); s->aspect_ratio_info= aspect_to_info(s->avctx->sample_aspect_ratio);
put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */ put_bits(&s->pb, 4, s->aspect_ratio_info);/* aspect ratio info */
if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){ if (s->aspect_ratio_info == FF_ASPECT_EXTENDED){