diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:57:20 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-09 23:57:20 +0200 |
| commit | c67690f854452df397f3f735d0ff107a3fe51d87 (patch) | |
| tree | 2bd4414d0a72eb3eb8cbf70d426039a475254e9d /libavformat/aacdec.c | |
| parent | e8a966e361a7512ecfb03073074c8b9084229e69 (diff) | |
| parent | a54f03bf07da964a1b04b03b85bc39deba76efa4 (diff) | |
| download | ffmpeg-streaming-c67690f854452df397f3f735d0ff107a3fe51d87.zip ffmpeg-streaming-c67690f854452df397f3f735d0ff107a3fe51d87.tar.gz | |
Merge commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4'
* commit 'a54f03bf07da964a1b04b03b85bc39deba76efa4':
display: add matrix flip api
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/aacdec.c')
0 files changed, 0 insertions, 0 deletions
