diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-04-30 20:03:16 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-04-30 22:09:15 +0200 |
| commit | a2eef3e9f579db4278ff32cba6281452a163b05f (patch) | |
| tree | 64f0475e4426b3806148397b43b7568b761b766d /libavformat | |
| parent | 8de45adb37bb0591626645e1f7d1303339b2bc9f (diff) | |
| download | ffmpeg-a2eef3e9f579db4278ff32cba6281452a163b05f.tar.gz | |
LAVF API: remove AVOutputFormat.set_parameters() the field is unused.
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/avformat.h | 7 | ||||
| -rw-r--r-- | libavformat/utils.c | 5 |
2 files changed, 3 insertions, 9 deletions
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; } |