Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(24)

Side by Side Diff: source/patched-ffmpeg-mt/libavdevice/oss_audio.c

Issue 3384002: ffmpeg source update for sep 09 (Closed) Base URL: svn://chrome-svn/chrome/trunk/deps/third_party/ffmpeg/
Patch Set: Created 10 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 /* 1 /*
2 * Linux audio play and grab interface 2 * Linux audio play and grab interface
3 * Copyright (c) 2000, 2001 Fabrice Bellard 3 * Copyright (c) 2000, 2001 Fabrice Bellard
4 * 4 *
5 * This file is part of FFmpeg. 5 * This file is part of FFmpeg.
6 * 6 *
7 * FFmpeg is free software; you can redistribute it and/or 7 * FFmpeg is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU Lesser General Public 8 * modify it under the terms of the GNU Lesser General Public
9 * License as published by the Free Software Foundation; either 9 * License as published by the Free Software Foundation; either
10 * version 2.1 of the License, or (at your option) any later version. 10 * version 2.1 of the License, or (at your option) any later version.
(...skipping 297 matching lines...) Expand 10 before | Expand all | Expand 10 after
308 #if CONFIG_OSS_OUTDEV 308 #if CONFIG_OSS_OUTDEV
309 AVOutputFormat oss_muxer = { 309 AVOutputFormat oss_muxer = {
310 "oss", 310 "oss",
311 NULL_IF_CONFIG_SMALL("Open Sound System playback"), 311 NULL_IF_CONFIG_SMALL("Open Sound System playback"),
312 "", 312 "",
313 "", 313 "",
314 sizeof(AudioData), 314 sizeof(AudioData),
315 /* XXX: we make the assumption that the soundcard accepts this format */ 315 /* XXX: we make the assumption that the soundcard accepts this format */
316 /* XXX: find better solution with "preinit" method, needed also in 316 /* XXX: find better solution with "preinit" method, needed also in
317 other formats */ 317 other formats */
318 #if HAVE_BIGENDIAN 318 AV_NE(CODEC_ID_PCM_S16BE, CODEC_ID_PCM_S16LE),
319 CODEC_ID_PCM_S16BE,
320 #else
321 CODEC_ID_PCM_S16LE,
322 #endif
323 CODEC_ID_NONE, 319 CODEC_ID_NONE,
324 audio_write_header, 320 audio_write_header,
325 audio_write_packet, 321 audio_write_packet,
326 audio_write_trailer, 322 audio_write_trailer,
327 .flags = AVFMT_NOFILE, 323 .flags = AVFMT_NOFILE,
328 }; 324 };
329 #endif 325 #endif
OLDNEW
« no previous file with comments | « source/patched-ffmpeg-mt/libavdevice/avdevice.h ('k') | source/patched-ffmpeg-mt/libavdevice/v4l.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698