this is hardly the right way to do things, but it'll suffice for now.
* patch from Gildas Bazin
gbazin at altern dot org
* fix for a 10l in configure
* gcc 2.95.3 and Solaris build in general are not ready
for -Werror in libavformat/Makefile
Originally committed as revision 2123 to svn://svn.ffmpeg.org/ffmpeg/trunk
elif test "$cpu" = "mips" ; then
echo "TARGET_ARCH_MIPS=yes" >> config.mak
echo "#define ARCH_MIPS 1" >> $TMPH
-fi
elif test "$cpu" = "sh4" ; then
echo "TARGET_ARCH_SH4=yes" >> config.mak
echo "#define ARCH_SH4 1" >> $TMPH
/**
* pixel format, see PIX_FMT_xxx.
- * - encoding: unused
+ * - encoding: FIXME: used by ffmpeg to decide whether an pix_fmt
+ * conversion is in order. This only works for
+ * codecs with one supported pix_fmt, we should
+ * do something for a generic case as well.
* - decoding: set by lavc.
*/
enum PixelFormat pix_fmt;
Mpeg1Context *s1 = avctx->priv_data;
MpegEncContext *s = &s1->mpeg_enc_ctx;
- if (!s1->mpeg_enc_ctx_allocated)
+ if (!s1->mpeg_enc_ctx_allocated || !s->current_picture_ptr)
return 0;
#ifdef HAVE_XVMC
int i;
int chroma_h_shift, chroma_v_shift;
+ avctx->pix_fmt = PIX_FMT_YUV420P; // FIXME
+
s->bit_rate = avctx->bit_rate;
s->bit_rate_tolerance = avctx->bit_rate_tolerance;
s->width = avctx->width;
pic->quality = s->reordered_input_picture[0]->quality;
pic->coded_picture_number = s->reordered_input_picture[0]->coded_picture_number;
pic->reference = s->reordered_input_picture[0]->reference;
+ pic->pts = s->reordered_input_picture[0]->pts;
alloc_picture(s, pic, 0);
VPATH=$(SRC_PATH)/libavformat
-CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -Werror
+CFLAGS= $(OPTFLAGS) -Wall -g -I.. -I$(SRC_PATH) -I$(SRC_PATH)/libavcodec -DHAVE_AV_CONFIG_H -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
OBJS= utils.o cutils.o allformats.o
PPOBJS=