← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Sebastian Dröge
  • Date: 2013-07-30 09:00:15 UTC
  • mfrom: (1.1.16) (7.1.7 experimental)
  • Revision ID: package-import@ubuntu.com-20130730090015-sc1ou2yssu7q5w4e
Tags: 1.1.3-1
* New upstream development snapshot:
  + debian/control:
    - Build depend on GStreamer and gst-plugins-base >= 1.1.3.

Show diffs side-by-side

added added

removed removed

Lines of Context:
gst-libs/ext/libav/libavformat/crypto.c
48
48
#define D AV_OPT_FLAG_DECODING_PARAM
49
49
static const AVOption options[] = {
50
50
    {"key", "AES decryption key", OFFSET(key), AV_OPT_TYPE_BINARY, .flags = D },
51
 
    {"iv",  "AES decryption initialization vector", OFFSET(iv),  AV_OPT_TYPE_BINARY, .flags = D },
 
51
    {"iv",  "AES decryption initialization vector", OFFSET(iv), AV_OPT_TYPE_BINARY, .flags = D },
52
52
    { NULL }
53
53
};
54
54
 
87
87
        av_log(h, AV_LOG_ERROR, "Unable to open input\n");
88
88
        goto err;
89
89
    }
90
 
    c->aes = av_mallocz(av_aes_size);
 
90
    c->aes = av_aes_alloc();
91
91
    if (!c->aes) {
92
92
        ret = AVERROR(ENOMEM);
93
93
        goto err;