diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:56:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-16 16:56:30 +0100 |
| commit | afb3fb335265a443aac83883606fa4274b4330b7 (patch) | |
| tree | fbe0bdabf6d302cf89d24002df7904a8f2dca899 /libavcodec/flacdsp_lpc_template.c | |
| parent | 7fff5781b6a94fa6f29a1e508f5badbbecf35232 (diff) | |
| parent | f4281f457194a6a4489fbd7423e2ab2e13c6d4d9 (diff) | |
| download | ffmpeg-afb3fb335265a443aac83883606fa4274b4330b7.tar.gz | |
Merge commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9'
* commit 'f4281f457194a6a4489fbd7423e2ab2e13c6d4d9':
asrc_anullsrc: do not set samplerate and channel layout explicitly
Conflicts:
libavfilter/asrc_anullsrc.c
No change to FFmpeg due to semantic difference between the filter sources
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdsp_lpc_template.c')
0 files changed, 0 insertions, 0 deletions