← Back to branch summary

~ubuntu-branches/ubuntu/trusty/ffmpeg-debian/trusty

« back to all changes in this revision

Viewing changes to libavformat/flvenc.c

  • Committer: Bazaar Package Importer
  • Author(s): Reinhard Tartler
  • Date: 2009-02-05 21:22:01 UTC
  • mfrom: (1.1.4 upstream)
  • Revision ID: james.westby@ubuntu.com-20090205212201-hjhtybuxtm90cbjy
Tags: 3:0.svn20090204-2ubuntu1
* merge from debian. Remaining changes:
  - don't build depend on libfaad-dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/flvenc.c
1
1
/*
2
2
 * FLV muxer
3
 
 * Copyright (c) 2003 The FFmpeg Project.
 
3
 * Copyright (c) 2003 The FFmpeg Project
4
4
 *
5
5
 * This file is part of FFmpeg.
6
6
 *
214
214
        put_amf_double(pb, video_enc->height);
215
215
 
216
216
        put_amf_string(pb, "videodatarate");
217
 
        put_amf_double(pb, s->bit_rate / 1024.0);
 
217
        put_amf_double(pb, video_enc->bit_rate / 1024.0);
218
218
 
219
219
        put_amf_string(pb, "framerate");
220
220
        put_amf_double(pb, framerate);
224
224
    }
225
225
 
226
226
    if(audio_enc){
 
227
        put_amf_string(pb, "audiodatarate");
 
228
        put_amf_double(pb, audio_enc->bit_rate / 1024.0);
 
229
 
227
230
        put_amf_string(pb, "audiosamplerate");
228
231
        put_amf_double(pb, audio_enc->sample_rate);
229
232