diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 12:44:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-19 12:44:06 +0200 |
| commit | 257f11820bdf628648466ce07ee0bf67217b543e (patch) | |
| tree | f328a91c1c7ba8349981596199484e768d1d2e3f /libswresample/resample_template.c | |
| parent | b26ccf218d933660c551832b4b14976b2acb3f0c (diff) | |
| parent | 5cdefc02079a5b899bdec09e15e2bb099cb01734 (diff) | |
| download | ffmpeg-257f11820bdf628648466ce07ee0bf67217b543e.tar.gz | |
Merge commit '5cdefc02079a5b899bdec09e15e2bb099cb01734'
* commit '5cdefc02079a5b899bdec09e15e2bb099cb01734':
aacdec: Add support for Error Resilience syntax.
Conflicts:
Changelog
libavcodec/aacdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/resample_template.c')
0 files changed, 0 insertions, 0 deletions