Commit 9dad924e authored by Michael Niedermayer's avatar Michael Niedermayer

bottom_field_first -> top_field_first

Originally committed as revision 2402 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent fa384dcc
......@@ -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.\
......
......@@ -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;
......
......@@ -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 */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment