~ubuntu-branches/ubuntu/utopic/libav/utopic-proposed

« back to all changes in this revision

Viewing changes to libavformat/yop.c

  • Committer: Package Import Robot
  • Author(s): Reinhard Tartler, Reinhard Tartler, Rico Tzschichholz
  • Date: 2014-08-30 11:02:45 UTC
  • mfrom: (1.3.47 sid)
  • Revision ID: package-import@ubuntu.com-20140830110245-io3dg7q85wfr7125
Tags: 6:11~beta1-2
[ Reinhard Tartler ]
* Make libavcodec-dev depend on libavresample-dev

[ Rico Tzschichholz ]
* Some fixes and leftovers from soname bumps

Show diffs side-by-side

added added

removed removed

Lines of Context:
62
62
    video_stream = avformat_new_stream(s, NULL);
63
63
 
64
64
    // Extra data that will be passed to the decoder
65
 
    video_stream->codec->extradata_size = 8;
66
65
 
67
 
    video_stream->codec->extradata = av_mallocz(video_stream->codec->extradata_size +
68
 
                                                FF_INPUT_BUFFER_PADDING_SIZE);
 
66
    video_stream->codec->extradata = av_mallocz(8 + FF_INPUT_BUFFER_PADDING_SIZE);
69
67
 
70
68
    if (!video_stream->codec->extradata)
71
69
        return AVERROR(ENOMEM);
 
70
    video_stream->codec->extradata_size = 8;
72
71
 
73
72
    // Audio
74
73
    audio_dec               = audio_stream->codec;