← Back to branch summary

~ubuntu-branches/ubuntu/trusty/gst-libav1.0/trusty-proposed

« back to all changes in this revision

Viewing changes to gst-libs/ext/libav/libavformat/smjpegenc.c

  • Committer: Package Import Robot
  • Author(s): Sebastian Dröge
  • Date: 2013-09-24 17:07:00 UTC
  • mfrom: (1.1.17) (7.1.9 experimental)
  • Revision ID: package-import@ubuntu.com-20130924170700-4dg62s3pwl0pdakz
Tags: 1.2.0-1
* New upstream stable release:
  + debian/control:
    - Build depend on GStreamer and gst-plugins-base >= 1.2.0.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/libav/libavformat/smjpegenc.c
26
26
 
27
27
#include "avformat.h"
28
28
#include "internal.h"
29
 
#include "riff.h"
30
29
#include "smjpeg.h"
31
30
 
32
31
typedef struct SMJPEGMuxContext {
130
129
    }
131
130
 
132
131
    avio_wl32(pb, SMJPEG_DONE);
133
 
    avio_flush(pb);
134
132
 
135
133
    return 0;
136
134
}
139
137
    .name           = "smjpeg",
140
138
    .long_name      = NULL_IF_CONFIG_SMALL("Loki SDL MJPEG"),
141
139
    .priv_data_size = sizeof(SMJPEGMuxContext),
142
 
    .audio_codec    = CODEC_ID_PCM_S16LE,
143
 
    .video_codec    = CODEC_ID_MJPEG,
 
140
    .audio_codec    = AV_CODEC_ID_PCM_S16LE,
 
141
    .video_codec    = AV_CODEC_ID_MJPEG,
144
142
    .write_header   = smjpeg_write_header,
145
143
    .write_packet   = smjpeg_write_packet,
146
144
    .write_trailer  = smjpeg_write_trailer,
147
 
    .flags          = AVFMT_GLOBALHEADER,
 
145
    .flags          = AVFMT_GLOBALHEADER | AVFMT_TS_NONSTRICT,
148
146
    .codec_tag      = (const AVCodecTag *const []){ ff_codec_smjpeg_video_tags, ff_codec_smjpeg_audio_tags, 0 },
149
147
};