diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2008-02-20 20:24:38 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2008-02-20 20:24:38 +0000 |
| commit | 635fbcb17f8f12d805dbefe4665a5b78e0d1618a (patch) | |
| tree | eaf27362f8ad0978206ef77469ff78fadb0ff161 /libavcodec | |
| parent | bdd745da60f8f1f4ae5d0a96d3874d3d58eab9c7 (diff) | |
revert 12156
Log:
Make timestamp interpolation work with mpeg2 field pictures.
Cleaner/simpler solutions are welcome.
----
A IMHO cleaner solution has been implemented.
Originally committed as revision 12162 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/avcodec.h | 1 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_parser.c | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index 44f45f2330..8870fded3f 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -2788,7 +2788,6 @@ typedef struct AVCodecParserContext { /* video info */ int pict_type; /* XXX: Put it back in AVCodecContext. */ int repeat_pict; /* XXX: Put it back in AVCodecContext. */ - int parity; int64_t pts; /* pts of the current frame */ int64_t dts; /* dts of the current frame */ diff --git a/libavcodec/mpegvideo_parser.c b/libavcodec/mpegvideo_parser.c index 5b48b1ccef..a7ce09d4c3 100644 --- a/libavcodec/mpegvideo_parser.c +++ b/libavcodec/mpegvideo_parser.c @@ -36,7 +36,6 @@ static void mpegvideo_extract_headers(AVCodecParserContext *s, int horiz_size_ext, vert_size_ext, bit_rate_ext; //FIXME replace the crap with get_bits() s->repeat_pict = 0; - s->parity = 0; buf_end = buf + buf_size; while (buf < buf_end) { start_code= -1; |