diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-04-21 22:56:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-04-21 22:56:07 +0200 |
| commit | c047afb80c7373c8533f5aeff6413015a814faaf (patch) | |
| tree | b1f31e060532f10412fb8a1d87582d61c1ee1e67 /libavcodec/pnm.h | |
| parent | 2f06b56382ddd4ae1bbe09fd07f6e7658bfece08 (diff) | |
| parent | 95510be8c35753da8f48062b28b65e7acdab965f (diff) | |
| download | ffmpeg-c047afb80c7373c8533f5aeff6413015a814faaf.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
avcodec: remove AVCodecContext.dsp_mask
avconv: fix a segfault when default encoder for a format doesn't exist.
utvideo: general cosmetics
aac: Handle HE-AACv2 when sniffing a channel order.
movenc: Support high sample rates in isomedia formats by setting the sample rate field in stsd to 0.
xxan: Remove write-only variable in xan_decode_frame_type0().
ivi_common: Initialize a variable at declaration in ff_ivi_decode_blocks().
Conflicts:
ffmpeg.c
libavcodec/utvideo.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/pnm.h')
0 files changed, 0 insertions, 0 deletions