diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 16:25:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-02 17:27:52 +0200 |
| commit | e88ca80dc325a0291c64e1dd3245c4943397cfa3 (patch) | |
| tree | df8abbc8d6defc5bf10932ed096ec18cd979d0eb /ffprobe.c | |
| parent | 82db8ee3211014a38db6b8cae03f1c3246938eee (diff) | |
| parent | bfcd4b6a1691d20aebc6d2308424c2a88334a9f0 (diff) | |
| download | ffmpeg-e88ca80dc325a0291c64e1dd3245c4943397cfa3.tar.gz | |
Merge commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0'
* commit 'bfcd4b6a1691d20aebc6d2308424c2a88334a9f0':
adpcmdec: set AVCodec.sample_fmts
twinvq: use planar sample format
ralf: use planar sample format
mpc7/8: use planar sample format
iac/imc: use planar sample format
dcadec: use float planar sample format
cook: use planar sample format
atrac3: use float planar sample format
apedec: output in planar sample format
8svx: use planar sample format
Conflicts:
libavcodec/8svx.c
libavcodec/dcadec.c
libavcodec/mpc7.c
libavcodec/mpc8.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffprobe.c')
0 files changed, 0 insertions, 0 deletions