diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-06-16 03:53:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-06-16 03:53:58 +0200 |
| commit | 7a02527b05e2ae5ffab579062dbe3c888758335f (patch) | |
| tree | c52ec9666f9436a6c15df3c6b32d08d897771aba /libavcodec/flac.h | |
| parent | a0bafaabb0656ca3bb3591beba0de79f6153fdac (diff) | |
| parent | b203f65451646b1555d458a3601159f7d89a3397 (diff) | |
| download | ffmpeg-7a02527b05e2ae5ffab579062dbe3c888758335f.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
ac3enc: use correct alignment and length in channel coupling dsp functions.
ffmpeg: don't abuse a global for passing framerate from input to output
ffmpeg: don't abuse a global for passing channels from input to output
ffmpeg: don't abuse a global for passing samplerate from input to output
ARM: update ff_h264_idct8_add4_neon for 4:4:4 changes
swscale: use SwsContext for av_log when available
swscale: Remove HAVE_MMX from files that are only compiled with MMX enabled.
swscale: Fix compilation with --disable-mmx2.
Conflicts:
ffmpeg.c
libswscale/utils.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flac.h')
0 files changed, 0 insertions, 0 deletions