diff options
Diffstat (limited to 'src/libffmpeg')
| -rw-r--r-- | src/libffmpeg/video_decoder.c | 6 | ||||
| -rw-r--r-- | src/libffmpeg/xine_decoder.h | 16 |
2 files changed, 7 insertions, 15 deletions
diff --git a/src/libffmpeg/video_decoder.c b/src/libffmpeg/video_decoder.c index a74886fab..a589ea949 100644 --- a/src/libffmpeg/video_decoder.c +++ b/src/libffmpeg/video_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: video_decoder.c,v 1.34 2004/09/22 20:29:14 miguelfreitas Exp $ + * $Id: video_decoder.c,v 1.35 2004/09/26 22:54:52 valtri Exp $ * * xine video decoder plugin using ffmpeg * @@ -721,6 +721,8 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { ff_video_decoder_t *this = (ff_video_decoder_t *) this_gen; int i, codec_type; uint8_t *ffbuf = this->buf; + AVRational avr00 = {0, 0}; + lprintf ("processing packet type = %08x, len = %d, decoder_flags=%08x\n", buf->type, buf->size, buf->decoder_flags); @@ -1036,7 +1038,7 @@ static void ff_decode_data (video_decoder_t *this_gen, buf_element_t *buf) { lprintf ("got a picture\n"); - if(av_cmp_q(this->context->sample_aspect_ratio, (AVRational){0,0})) { + if(av_cmp_q(this->context->sample_aspect_ratio, avr00)) { this->aspect_ratio = av_q2d(this->context->sample_aspect_ratio) * (double)this->bih.biWidth / (double)this->bih.biHeight; _x_stream_info_set(this->stream, XINE_STREAM_INFO_VIDEO_RATIO, diff --git a/src/libffmpeg/xine_decoder.h b/src/libffmpeg/xine_decoder.h index 3119a41db..9005b602e 100644 --- a/src/libffmpeg/xine_decoder.h +++ b/src/libffmpeg/xine_decoder.h @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.h,v 1.3 2004/08/16 15:31:23 mroi Exp $ + * $Id: xine_decoder.h,v 1.4 2004/09/26 22:54:52 valtri Exp $ * */ @@ -28,18 +28,6 @@ #include "config.h" #endif -#ifdef _MSC_VER -/* ffmpeg has own definitions of those types */ -# undef int8_t -# undef uint8_t -# undef int16_t -# undef uint16_t -# undef int32_t -# undef uint32_t -# undef int64_t -# undef uint64_t -#endif - #ifdef HAVE_FFMPEG # include <avcodec.h> #else @@ -50,6 +38,8 @@ # undef malloc # undef free # undef realloc +# undef printf +# undef fprintf #endif typedef struct ff_codec_s { |