//#define DEBUG
#include "libavutil/intreadwrite.h"
+#include "libavutil/dict.h"
+#include "libavutil/mathematics.h"
#include "avformat.h"
typedef struct {
{
AVStream *st = av_new_stream(s, 0);
char filename[258];
- int tmp, tmp2;
+ int tmp;
+ int av_unused tmp2;
if (!st)
return AVERROR(ENOMEM);
avio_read(s->pb, filename, 257);
filename[sizeof(filename)-1] = 0;
- av_metadata_set2(&st->metadata, "filename", filename, 0);
+ av_dict_set(&st->metadata, "filename", filename, 0);
av_dlog(s, "filename %s\n", filename);
av_dlog(s, "resolution %dx%d\n", st->codec->width, st->codec->height);
static void r3d_read_reos(AVFormatContext *s)
{
R3DContext *r3d = s->priv_data;
- int tmp;
+ int av_unused tmp;
r3d->rdvo_offset = avio_rb32(s->pb);
avio_rb32(s->pb); // rdvs offset
static int r3d_read_redv(AVFormatContext *s, AVPacket *pkt, Atom *atom)
{
AVStream *st = s->streams[0];
- int tmp, tmp2;
+ int tmp;
+ int av_unused tmp2;
uint64_t pos = avio_tell(s->pb);
unsigned dts;
int ret;
static int r3d_read_reda(AVFormatContext *s, AVPacket *pkt, Atom *atom)
{
AVStream *st = s->streams[1];
- int tmp, tmp2, samples, size;
+ int av_unused tmp, tmp2;
+ int samples, size;
uint64_t pos = avio_tell(s->pb);
unsigned dts;
int ret;
}
AVInputFormat ff_r3d_demuxer = {
- "r3d",
- NULL_IF_CONFIG_SMALL("REDCODE R3D format"),
- sizeof(R3DContext),
- r3d_probe,
- r3d_read_header,
- r3d_read_packet,
- r3d_close,
- r3d_seek,
+ .name = "r3d",
+ .long_name = NULL_IF_CONFIG_SMALL("REDCODE R3D format"),
+ .priv_data_size = sizeof(R3DContext),
+ .read_probe = r3d_probe,
+ .read_header = r3d_read_header,
+ .read_packet = r3d_read_packet,
+ .read_close = r3d_close,
+ .read_seek = r3d_seek,
};