diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 01:02:26 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-14 01:12:12 +0200 |
| commit | 0de0c75ebbecfa86f7c3a12f0cf748e79d221513 (patch) | |
| tree | ecda00620aad9c83e3ebd47b218ad0875ffe04c3 /compat/aix | |
| parent | 082d52354f77a8cc5423a879ce9123dc3d7055cd (diff) | |
| parent | 30e50c50274f88f0f5ae829f401cd3c7f5266719 (diff) | |
| download | ffmpeg-0de0c75ebbecfa86f7c3a12f0cf748e79d221513.tar.gz | |
Merge commit '30e50c50274f88f0f5ae829f401cd3c7f5266719'
* commit '30e50c50274f88f0f5ae829f401cd3c7f5266719':
lavf: eliminate ff_get_audio_frame_size()
Conflicts:
libavformat/utils.c
Not merged as the removed code is needed for some bugfixes and
would break the fate tests
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'compat/aix')
0 files changed, 0 insertions, 0 deletions