diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 14:59:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 15:00:03 +0100 |
| commit | 8c5fece11fcb845f459eebb86b03f98d39e5880c (patch) | |
| tree | a07ddbe4933e3934756d6459df3f4b82218a65a4 /libavfilter/framesync.c | |
| parent | 1bc3f1b73dfff1a23b9bad1d4fef32dcced47f64 (diff) | |
| parent | 462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6 (diff) | |
| download | ffmpeg-8c5fece11fcb845f459eebb86b03f98d39e5880c.tar.gz | |
Merge commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6'
* commit '462d5e8e6c050eae7cbb1f2d5c34628088bd0eb6':
aacdec: set AVFrame sample_rate
Conflicts:
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter/framesync.c')
0 files changed, 0 insertions, 0 deletions