diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index 542200f7a1beaea16ea7e92ffd5ade168208f573..f6c052a04bb73f81aba807ec4d75177b75bf1b60 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -15,7 +15,7 @@ extern "C" {
 
 #define FFMPEG_VERSION_INT     0x000408
 #define FFMPEG_VERSION         "0.4.8"
-#define LIBAVCODEC_BUILD       4685
+#define LIBAVCODEC_BUILD       4686
 
 #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
 #define LIBAVCODEC_VERSION     FFMPEG_VERSION
@@ -436,11 +436,11 @@ typedef struct AVPanScan{
     int interlaced_frame;\
     \
     /**\
-     * if the content is interlaced, is bottom field displayed first.\
+     * if the content is interlaced, is top field displayed first.\
      * - encoding: set by user\
-     * - decoding: set by lavc (default 0)\
+     * - decoding: set by lavc\
      */\
-    int bottom_field_first;\
+    int top_field_first;\
     \
     /**\
      * Pan scan.\
diff --git a/libavcodec/dv.c b/libavcodec/dv.c
index 419d2de524eba8b62c3f7639bacd2f1db95e3e94..c969e937ba9c39f9467e568923e865a5f2028e3e 100644
--- a/libavcodec/dv.c
+++ b/libavcodec/dv.c
@@ -855,7 +855,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
         return -1;
     }
     s->picture.interlaced_frame = 1;
-    s->picture.bottom_field_first = 1;
+    s->picture.top_field_first = 0;
 
     /* for each DIF segment */
     mb_pos_ptr = s->sys->video_place;
diff --git a/libavformat/yuv4mpeg.c b/libavformat/yuv4mpeg.c
index c6e062051b419a10e30ed0d59cbc23df1e91d98c..e9f08c8343a0570af31a48a12191257adc972f06 100644
--- a/libavformat/yuv4mpeg.c
+++ b/libavformat/yuv4mpeg.c
@@ -54,7 +54,7 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
     
     inter = 'p'; /* progressive is the default */
     if (st->codec.coded_frame && st->codec.coded_frame->interlaced_frame) {
-        inter = st->codec.coded_frame->bottom_field_first ? 'b' : 't';
+        inter = st->codec.coded_frame->top_field_first ? 't' : 'b';
     }
 
     /* construct stream header, if this is the first frame */