← Back to branch summary

~noskcaj/ubuntu/saucy/libav/merge0.8.7-1

« back to all changes in this revision

Viewing changes to libavformat/rawdec.h

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler
  • Date: 2012-01-12 22:30:00 UTC
  • mfrom: (1.2.8) (1.1.13 experimental)
  • Revision ID: package-import@ubuntu.com-20120112223000-cmfo7w78q13i2fd9
Tags: 4:0.8~beta2-1ubuntu1
* Merge from debian, remaining changes:
  - don't build against libdirac, lame, libopenjpeg, librtmp, 
    x264, and xvid  (all in universe)

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/rawdec.h
24
24
 
25
25
#include "avformat.h"
26
26
#include "libavutil/log.h"
 
27
#include "libavutil/opt.h"
27
28
 
28
29
typedef struct RawAudioDemuxerContext {
29
30
    AVClass *class;
38
39
    char *framerate;          /**< String describing framerate, set by a private option. */
39
40
} FFRawVideoDemuxerContext;
40
41
 
41
 
extern const AVClass ff_rawaudio_demuxer_class;
42
 
extern const AVClass ff_rawvideo_demuxer_class;
 
42
extern const AVOption ff_rawvideo_options[];
43
43
 
44
44
int ff_raw_read_header(AVFormatContext *s, AVFormatParameters *ap);
45
45
 
49
49
 
50
50
int ff_raw_video_read_header(AVFormatContext *s, AVFormatParameters *ap);
51
51
 
 
52
#define FF_RAWVIDEO_DEMUXER_CLASS(name)\
 
53
static const AVClass name ## _demuxer_class = {\
 
54
    .class_name = #name " demuxer",\
 
55
    .item_name  = av_default_item_name,\
 
56
    .option     = ff_rawvideo_options,\
 
57
    .version    = LIBAVUTIL_VERSION_INT,\
 
58
};
 
59
 
52
60
#define FF_DEF_RAWVIDEO_DEMUXER(shortname, longname, probe, ext, id)\
 
61
FF_RAWVIDEO_DEMUXER_CLASS(shortname)\
53
62
AVInputFormat ff_ ## shortname ## _demuxer = {\
54
63
    .name           = #shortname,\
55
64
    .long_name      = NULL_IF_CONFIG_SMALL(longname),\
60
69
    .flags          = AVFMT_GENERIC_INDEX,\
61
70
    .value          = id,\
62
71
    .priv_data_size = sizeof(FFRawVideoDemuxerContext),\
63
 
    .priv_class     = &ff_rawvideo_demuxer_class,\
 
72
    .priv_class     = &shortname ## _demuxer_class,\
64
73
};
65
74
 
66
75
#endif /* AVFORMAT_RAWDEC_H */