summaryrefslogtreecommitdiff
path: root/libavcodec/mpegvideo_common.h
diff options
context:
space:
mode:
authorAurelien Jacobs <aurel@gnuage.org>2008-03-09 23:31:02 +0000
committerAurelien Jacobs <aurel@gnuage.org>2008-03-09 23:31:02 +0000
commit9701840bb539546bc0cfb1307b04655140851b04 (patch)
tree283d60d225a87c960c78d20975491802b3385797 /libavcodec/mpegvideo_common.h
parent88855b51cdba35c2e7daf8351645d91cf85cb8af (diff)
add FF_ prefix to all (frame)_TYPE usage
Originally committed as revision 12399 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/mpegvideo_common.h')
-rw-r--r--libavcodec/mpegvideo_common.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/mpegvideo_common.h b/libavcodec/mpegvideo_common.h
index f2655a9545..2be817261b 100644
--- a/libavcodec/mpegvideo_common.h
+++ b/libavcodec/mpegvideo_common.h
@@ -608,7 +608,7 @@ static inline void MPV_motion(MpegEncContext *s,
prefetch_motion(s, ref_picture, dir);
- if(s->obmc && s->pict_type != B_TYPE){
+ if(s->obmc && s->pict_type != FF_B_TYPE){
int16_t mv_cache[4][4][2];
const int xy= s->mb_x + s->mb_y*s->mb_stride;
const int mot_stride= s->b8_stride;
@@ -770,7 +770,7 @@ static inline void MPV_motion(MpegEncContext *s,
s->mv[dir][1][0], s->mv[dir][1][1], 8);
}
} else {
- if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != B_TYPE && !s->first_field){
+ if(s->picture_structure != s->field_select[dir][0] + 1 && s->pict_type != FF_B_TYPE && !s->first_field){
ref_picture= s->current_picture_ptr->data;
}
@@ -784,7 +784,7 @@ static inline void MPV_motion(MpegEncContext *s,
for(i=0; i<2; i++){
uint8_t ** ref2picture;
- if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == B_TYPE || s->first_field){
+ if(s->picture_structure == s->field_select[dir][i] + 1 || s->pict_type == FF_B_TYPE || s->first_field){
ref2picture= ref_picture;
}else{
ref2picture= s->current_picture_ptr->data;