diff options
| author | Peter Korsgaard <peter@korsgaard.com> | 2014-09-01 15:22:07 +0200 |
|---|---|---|
| committer | Peter Korsgaard <peter@korsgaard.com> | 2014-09-01 15:22:07 +0200 |
| commit | 5aedb8be688d47526101bdb3e58598df588326e6 (patch) | |
| tree | ae348b9262fdaf123b3b152e65b6116b5ef36cb4 /package/ffmpeg | |
| parent | 7f0ce7c8780569afa33b68c9c024bf4072e29a99 (diff) | |
| parent | 62387a8b11224a9c5320d42e2f0c4e2089d3452b (diff) | |
| download | buildroot-5aedb8be688d47526101bdb3e58598df588326e6.tar.gz buildroot-5aedb8be688d47526101bdb3e58598df588326e6.zip | |
Merge branch 'next'
Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
Diffstat (limited to 'package/ffmpeg')
| -rw-r--r-- | package/ffmpeg/ffmpeg.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/package/ffmpeg/ffmpeg.mk b/package/ffmpeg/ffmpeg.mk index e8d4adae3a..6771309816 100644 --- a/package/ffmpeg/ffmpeg.mk +++ b/package/ffmpeg/ffmpeg.mk @@ -4,7 +4,7 @@ # ################################################################################ -FFMPEG_VERSION = 2.3.1 +FFMPEG_VERSION = 2.3.3 FFMPEG_SOURCE = ffmpeg-$(FFMPEG_VERSION).tar.bz2 FFMPEG_SITE = http://ffmpeg.org/releases FFMPEG_INSTALL_STAGING = YES |
