diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-05 02:33:59 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-05 03:00:31 +0200 |
| commit | 46eb300d016b69b5fedb0410df98e3c698090c8c (patch) | |
| tree | 7aa230d9098654e1ce94bc32c2cfb8f1463e9e3b /libavformat/rawdec.h | |
| parent | 124a9edb5f172ce36b11fd0d6ccc9f15cc51f322 (diff) | |
| parent | 594fbe42c6b21aef76b938ce97524fa92a48e7a0 (diff) | |
| download | ffmpeg-46eb300d016b69b5fedb0410df98e3c698090c8c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ARM: remove MULL inline asm
mathops: use MUL64 macro where it forms part of other ops
tty: factorise returning error codes.
rawdec: add framerate private option.
x11grab: add framerate private option.
fbdev,v4l2: remove some forgotten uses of AVFormatParameters.time_base.
bktr: don't error when AVFormatParameters.time_base isn't set.
cmdutils: add missing const qualifier
Skip headers not designed to work standalone during 'make checkheaders'.
Add missing #includes to make headers self-contained.
musepack: remove unnecessary #include from mpcdata.h
musepack: remove extraneous mpcdata.h inclusions
Fix error check in av_file_map()
Conflicts:
cmdutils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/rawdec.h')
| -rw-r--r-- | libavformat/rawdec.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/libavformat/rawdec.h b/libavformat/rawdec.h index f5d40c063f..6cb5af2b0a 100644 --- a/libavformat/rawdec.h +++ b/libavformat/rawdec.h @@ -35,6 +35,7 @@ typedef struct FFRawVideoDemuxerContext { const AVClass *class; /**< Class for private options. */ char *video_size; /**< String describing video size, set by a private option. */ char *pixel_format; /**< Set by a private option. */ + char *framerate; /**< String describing framerate, set by a private option. */ } FFRawVideoDemuxerContext; extern const AVClass ff_rawaudio_demuxer_class; @@ -58,6 +59,8 @@ AVInputFormat ff_ ## shortname ## _demuxer = {\ .extensions = ext,\ .flags = AVFMT_GENERIC_INDEX,\ .value = id,\ + .priv_data_size = sizeof(FFRawVideoDemuxerContext),\ + .priv_class = &ff_rawvideo_demuxer_class,\ }; #endif /* AVFORMAT_RAWDEC_H */ |