diff --git a/libavformat/avformat.h b/libavformat/avformat.h index 2f41f7263b..c77cbbbda0 100644 --- a/libavformat/avformat.h +++ b/libavformat/avformat.h @@ -285,10 +285,9 @@ typedef struct AVOutputFormat { * AVFMT_NODIMENSIONS, AVFMT_NOSTREAMS */ int flags; - /** - * Currently only used to set pixel format if not YUV420P. - */ - int (*set_parameters)(struct AVFormatContext *, AVFormatParameters *); + + void *dummy; + int (*interleave_packet)(struct AVFormatContext *, AVPacket *out, AVPacket *in, int flush); diff --git a/libavformat/utils.c b/libavformat/utils.c index e7ce9110ab..501a411599 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2716,11 +2716,6 @@ int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap) } else s->priv_data = NULL; - if (s->oformat->set_parameters) { - ret = s->oformat->set_parameters(s, ap); - if (ret < 0) - return ret; - } return 0; }