diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-27 23:45:14 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-27 23:45:22 +0100 |
| commit | c94ed2a729649f614dc433032b3b3ca189057644 (patch) | |
| tree | 60aba0aaf5da0547d85e06855eb8f621e66fc753 /libavformat/utils.c | |
| parent | 673ce8e46ae229c0f1c72fc9a48ce16dd360e3ab (diff) | |
| parent | ded6b3af41cd5d41f4df728ced4b194cf0426105 (diff) | |
| download | ffmpeg-c94ed2a729649f614dc433032b3b3ca189057644.tar.gz | |
Merge remote-tracking branch 'lukaszmluki/master'
* lukaszmluki/master:
lavd: add opengl device
lavd: add avdevice_dev_to_app_control_message API
lavd: add avdevice_app_to_dev_control_message API
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d425b5bc61..ac9236b18f 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -107,6 +107,8 @@ MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, video_codec) MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, audio_codec) MAKE_ACCESSORS(AVFormatContext, format, AVCodec *, subtitle_codec) MAKE_ACCESSORS(AVFormatContext, format, int, metadata_header_padding) +MAKE_ACCESSORS(AVFormatContext, format, void *, opaque) +MAKE_ACCESSORS(AVFormatContext, format, av_format_control_message, control_message_cb) static AVCodec *find_decoder(AVFormatContext *s, AVStream *st, enum AVCodecID codec_id) { |