Commit 523ccf94 authored by michael's avatar michael

bottom_field_first -> top_field_first


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@2402 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent ea0b3e14
...@@ -15,7 +15,7 @@ extern "C" { ...@@ -15,7 +15,7 @@ extern "C" {
#define FFMPEG_VERSION_INT 0x000408 #define FFMPEG_VERSION_INT 0x000408
#define FFMPEG_VERSION "0.4.8" #define FFMPEG_VERSION "0.4.8"
#define LIBAVCODEC_BUILD 4685 #define LIBAVCODEC_BUILD 4686
#define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT #define LIBAVCODEC_VERSION_INT FFMPEG_VERSION_INT
#define LIBAVCODEC_VERSION FFMPEG_VERSION #define LIBAVCODEC_VERSION FFMPEG_VERSION
...@@ -436,11 +436,11 @@ typedef struct AVPanScan{ ...@@ -436,11 +436,11 @@ typedef struct AVPanScan{
int interlaced_frame;\ 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\ * - encoding: set by user\
* - decoding: set by lavc (default 0)\ * - decoding: set by lavc\
*/\ */\
int bottom_field_first;\ int top_field_first;\
\ \
/**\ /**\
* Pan scan.\ * Pan scan.\
......
...@@ -855,7 +855,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx, ...@@ -855,7 +855,7 @@ static int dvvideo_decode_frame(AVCodecContext *avctx,
return -1; return -1;
} }
s->picture.interlaced_frame = 1; s->picture.interlaced_frame = 1;
s->picture.bottom_field_first = 1; s->picture.top_field_first = 0;
/* for each DIF segment */ /* for each DIF segment */
mb_pos_ptr = s->sys->video_place; mb_pos_ptr = s->sys->video_place;
......
...@@ -54,7 +54,7 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf) ...@@ -54,7 +54,7 @@ static int yuv4_generate_header(AVFormatContext *s, char* buf)
inter = 'p'; /* progressive is the default */ inter = 'p'; /* progressive is the default */
if (st->codec.coded_frame && st->codec.coded_frame->interlaced_frame) { 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 */ /* 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