diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:21:23 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-27 23:21:23 +0200 |
| commit | e3ec2cde2c394af6c9b64bccd39bc206a88a4e58 (patch) | |
| tree | 0b92c7fb4a905429cbac55bf810575d8b656f12a /doc/ffmpeg-resampler.texi | |
| parent | 29d147c94dd40a78ca3981f39365cc77dae9a0da (diff) | |
| parent | b94ec30428b9696f99b08055735689623fe63954 (diff) | |
| download | ffmpeg-e3ec2cde2c394af6c9b64bccd39bc206a88a4e58.tar.gz | |
Merge commit 'b94ec30428b9696f99b08055735689623fe63954'
* commit 'b94ec30428b9696f99b08055735689623fe63954':
lavc: Update version and APIchanges
Conflicts:
doc/APIchanges
libavcodec/avcodec.h
libavcodec/version.h
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'doc/ffmpeg-resampler.texi')
0 files changed, 0 insertions, 0 deletions