]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a665704 adea451)
Merge commit 'adea4512c6087280702e2423de55cea050e20a98'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 00:46:34 +0000 (02:46 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 26 Oct 2013 00:46:40 +0000 (02:46 +0200)
* commit 'adea4512c6087280702e2423de55cea050e20a98':
  aacdec: Fix calls to avpriv_report_missing_feature().

See: 435a730e2190c9b005117eaad57f7559cd82581c
See: 72cf47b241c7972cce313e1f474bdb8f3684fa15

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.