mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2026-06-19 19:03:00 +02:00
Merge remote-tracking branch 'qatar/master'
* qatar/master: yuv4mpeg: return proper error codes. Give all anonymously typedeffed structs in headers a name fate: Add parseutils test parseutils-test: Drop random colors from parsing test vf_pad/scale: use double precision for aspect ratios. build: error on variable-length arrays ppc: swscale: rework yuv2planeX_altivec() ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec() x86: dsputil: kill VLA in gmc_mmx() libspeexenc: Updated commentary to reflect recent changes libspeexenc: Add an option for enabling DTX doc/APIchanges: fill in missing dates and hashes. lavr: bump major to 1 and declare it stable. lavr: change the type of the data buffers to uint8_t**. lavc: deprecate the audio resampling API. Conflicts: cmdutils.h configure doc/APIchanges ffplay.c libavcodec/dwt.h libavcodec/libspeexenc.c libavfilter/vf_pad.c libavfilter/vf_scale.c libavformat/asf.h tests/fate/libavutil.mak tests/ref/fate/parseutils Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
@@ -45,7 +45,7 @@ typedef void (*ff_reorder_func)(const void *, void *, int);
|
||||
|
||||
#define ALSA_BUFFER_SIZE_MAX 65536
|
||||
|
||||
typedef struct {
|
||||
typedef struct AlsaData {
|
||||
AVClass *class;
|
||||
snd_pcm_t *h;
|
||||
int frame_size; ///< bytes per sample * channels
|
||||
|
||||
@@ -28,7 +28,7 @@
|
||||
#include "libavutil/log.h"
|
||||
#include "avdevice.h"
|
||||
|
||||
typedef struct {
|
||||
typedef struct SndioData {
|
||||
AVClass *class;
|
||||
struct sio_hdl *hdl;
|
||||
enum AVCodecID codec_id;
|
||||
|
||||
Reference in New Issue
Block a user