diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-03-29 11:32:24 +0200 |
| commit | 268ff17cb785c3ae94be0aca31ed8709e149b487 (patch) | |
| tree | 0d8f9f3b52d0430765ef2bfe389cbea1149b4ca8 /doc | |
| parent | cf16b459a873b990efc10d93e9912ab01b8a0fba (diff) | |
| parent | c48456166e95648719a8be8f8613f9dee98205c1 (diff) | |
| download | ffmpeg-268ff17cb785c3ae94be0aca31ed8709e149b487.tar.gz | |
Merge commit 'c48456166e95648719a8be8f8613f9dee98205c1'
* commit 'c48456166e95648719a8be8f8613f9dee98205c1':
lavc: add MMAL hardware decoder wrapper
Conflicts:
Changelog
configure
doc/APIchanges
libavcodec/Makefile
libavcodec/allcodecs.c
libavcodec/version.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/APIchanges | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/doc/APIchanges b/doc/APIchanges index 3f153e9faf..30caaeb066 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,9 @@ libavutil: 2014-08-09 API changes, most recent first: +2015-xx-xx - xxxxxxx - lavu 54.21.100 / 54.10.0 + Add AV_PIX_FMT_MMAL for MMAL hardware acceleration. + -------- 8< --------- FFmpeg 2.6 was cut here -------- 8< --------- 2015-03-04 - cca4476 - lavf 56.25.100 |