← Back to branch summary

~ubuntu-branches/ubuntu/hardy/ffmpeg/hardy

« back to all changes in this revision

Viewing changes to libavformat/audio.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2006-08-23 14:35:52 UTC
  • mfrom: (1.1.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20060823143552-8fxnur5b9gesr03m
Tags: 3:0.cvs20060823-0ubuntu1
* Sync with Debian:
  + Add the epoch again

Show diffs side-by-side

added added

removed removed

Lines of Context:
libavformat/audio.c
313
313
    return 0;
314
314
}
315
315
 
316
 
static AVInputFormat audio_in_format = {
 
316
#ifdef CONFIG_AUDIO_DEMUXER
 
317
AVInputFormat audio_demuxer = {
317
318
    "audio_device",
318
319
    "audio grab and output",
319
320
    sizeof(AudioData),
323
324
    audio_read_close,
324
325
    .flags = AVFMT_NOFILE,
325
326
};
 
327
#endif
326
328
 
327
 
static AVOutputFormat audio_out_format = {
 
329
#ifdef CONFIG_AUDIO_MUXER
 
330
AVOutputFormat audio_muxer = {
328
331
    "audio_device",
329
332
    "audio grab and output",
330
333
    "",
344
347
    audio_write_trailer,
345
348
    .flags = AVFMT_NOFILE,
346
349
};
347
 
 
348
 
int audio_init(void)
349
 
{
350
 
    av_register_input_format(&audio_in_format);
351
 
    av_register_output_format(&audio_out_format);
352
 
    return 0;
353
 
}
 
350
#endif