int top_field_first;
};
+#ifdef CONFIG_YUV4MPEGPIPE_MUXER
static int yuv4_generate_header(AVFormatContext *s, char* buf)
{
AVStream *st;
av_reduce(&raten, &rated, st->codec->time_base.den, st->codec->time_base.num, (1UL<<31)-1);
- aspectn = st->codec->sample_aspect_ratio.num;
- aspectd = st->codec->sample_aspect_ratio.den;
+ aspectn = st->sample_aspect_ratio.num;
+ aspectd = st->sample_aspect_ratio.den;
if ( aspectn == 0 && aspectd == 1 ) aspectd = 0; // 0:0 means unknown
static int yuv4_write_packet(AVFormatContext *s, AVPacket *pkt)
{
AVStream *st = s->streams[pkt->stream_index];
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
AVPicture *picture;
int* first_pkt = s->priv_data;
int width, height, h_chroma_shift, v_chroma_shift;
*first_pkt = 0;
if (yuv4_generate_header(s, buf2) < 0) {
av_log(s, AV_LOG_ERROR, "Error. YUV4MPEG stream header write failed.\n");
- return AVERROR_IO;
+ return AVERROR(EIO);
} else {
put_buffer(pb, buf2, strlen(buf2));
}
int* first_pkt = s->priv_data;
if (s->nb_streams != 1)
- return AVERROR_IO;
+ return AVERROR(EIO);
if (s->streams[0]->codec->pix_fmt == PIX_FMT_YUV411P) {
av_log(s, AV_LOG_ERROR, "Warning: generating rarely used 4:1:1 YUV stream, some mjpegtools might not work.\n");
(s->streams[0]->codec->pix_fmt != PIX_FMT_GRAY8) &&
(s->streams[0]->codec->pix_fmt != PIX_FMT_YUV444P)) {
av_log(s, AV_LOG_ERROR, "ERROR: yuv4mpeg only handles yuv444p, yuv422p, yuv420p, yuv411p and gray pixel formats. Use -pix_fmt to select one.\n");
- return AVERROR_IO;
+ return AVERROR(EIO);
}
*first_pkt = 1;
return 0;
}
-#ifdef CONFIG_YUV4MPEGPIPE_MUXER
AVOutputFormat yuv4mpegpipe_muxer = {
"yuv4mpegpipe",
- "YUV4MPEG pipe format",
+ NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
"",
"y4m",
sizeof(int),
char header[MAX_YUV4_HEADER+10]; // Include headroom for the longest option
char *tokstart,*tokend,*header_end;
int i;
- ByteIOContext *pb = &s->pb;
+ ByteIOContext *pb = s->pb;
int width=-1, height=-1, raten=0, rated=0, aspectn=0, aspectd=0;
enum PixelFormat pix_fmt=PIX_FMT_NONE,alt_pix_fmt=PIX_FMT_NONE;
AVStream *st;
}
st = av_new_stream(s, 0);
- st = s->streams[0];
+ if(!st)
+ return AVERROR(ENOMEM);
st->codec->width = width;
st->codec->height = height;
av_reduce(&raten, &rated, raten, rated, (1UL<<31)-1);
st->codec->pix_fmt = pix_fmt;
st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_RAWVIDEO;
- st->codec->sample_aspect_ratio= (AVRational){aspectn, aspectd};
+ st->sample_aspect_ratio= (AVRational){aspectn, aspectd};
return 0;
}
struct frame_attributes *s1 = s->priv_data;
for (i=0; i<MAX_FRAME_HEADER; i++) {
- header[i] = get_byte(&s->pb);
+ header[i] = get_byte(s->pb);
if (header[i] == '\n') {
header[i+1] = 0;
break;
if (packet_size < 0)
return -1;
- if (av_get_packet(&s->pb, pkt, packet_size) != packet_size)
- return AVERROR_IO;
+ if (av_get_packet(s->pb, pkt, packet_size) != packet_size)
+ return AVERROR(EIO);
if (s->streams[0]->codec->coded_frame) {
s->streams[0]->codec->coded_frame->interlaced_frame = s1->interlaced_frame;
return 0;
}
-static int yuv4_read_close(AVFormatContext *s)
-{
- return 0;
-}
-
static int yuv4_probe(AVProbeData *pd)
{
/* check file header */
#ifdef CONFIG_YUV4MPEGPIPE_DEMUXER
AVInputFormat yuv4mpegpipe_demuxer = {
"yuv4mpegpipe",
- "YUV4MPEG pipe format",
+ NULL_IF_CONFIG_SMALL("YUV4MPEG pipe format"),
sizeof(struct frame_attributes),
yuv4_probe,
yuv4_read_header,
yuv4_read_packet,
- yuv4_read_close,
.extensions = "y4m"
};
#endif