Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(167)

Unified Diff: source/patched-ffmpeg-mt/libavcodec/mpegvideo.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: source/patched-ffmpeg-mt/libavcodec/mpegvideo.c
===================================================================
--- source/patched-ffmpeg-mt/libavcodec/mpegvideo.c (revision 59334)
+++ source/patched-ffmpeg-mt/libavcodec/mpegvideo.c (working copy)
@@ -590,7 +590,7 @@
return -1;
}
- if((s->width || s->height) && av_check_image_size(s->width, s->height, 0, s->avctx))
+ if((s->width || s->height) && av_image_check_size(s->width, s->height, 0, s->avctx))
return -1;
dsputil_init(&s->dsp, s->avctx);
@@ -1052,7 +1052,14 @@
return -1;
s->current_picture_ptr= pic;
- s->current_picture_ptr->top_field_first= s->top_field_first; //FIXME use only the vars from current_pic
+ //FIXME use only the vars from current_pic
+ if(s->codec_id == CODEC_ID_MPEG1VIDEO || s->codec_id == CODEC_ID_MPEG2VIDEO) {
+ if(s->picture_structure == PICT_FRAME)
+ s->current_picture_ptr->top_field_first= s->top_field_first;
+ else
+ s->current_picture_ptr->top_field_first= (s->picture_structure == PICT_TOP_FIELD) == s->first_field;
+ } else
+ s->current_picture_ptr->top_field_first= s->top_field_first;
s->current_picture_ptr->interlaced_frame= !s->progressive_frame && !s->progressive_sequence;
s->current_picture_ptr->field_picture= s->picture_structure != PICT_FRAME;
}
« no previous file with comments | « source/patched-ffmpeg-mt/libavcodec/motion-test.c ('k') | source/patched-ffmpeg-mt/libavcodec/mpegvideo_enc.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698