Update to 2.4.2:

version 2.4.2:
- avcodec/on2avc: Check number of channels
- avcodec/hevc: fix chroma transform_add size
- avcodec/h264: Check mode before considering mixed mode intra prediction
- avformat/mpegts: use a padded buffer in read_sl_header()
- avformat/mpegts: Check desc_len / get8() return code
- avcodec/vorbisdec: Fix off by 1 error in ptns_to_read
- sdp: add support for H.261
- avcodec/svq3: Do not memcpy AVFrame
- avcodec/smc: fix off by 1 error
- avcodec/qpeg: fix off by 1 error in MV bounds check
- avcodec/gifdec: factorize interleave end handling out
- avcodec/cinepak: fix integer underflow
- avcodec/pngdec: Check bits per pixel before setting monoblack pixel format
- avcodec/pngdec: Calculate MPNG bytewidth more defensively
- avcodec/tiff: more completely check bpp/bppcount
- avcodec/mmvideo: Bounds check 2nd line of HHV Intra blocks
- avcodec/h263dec: Fix decoding messenger.h263
- avcodec/utils: Add case for jv to avcodec_align_dimensions2()
- avcodec/mjpegdec: check bits per pixel for changes similar to dimensions
- avcodec/jpeglsdec: Check run value more completely in ls_decode_line()
- avformat/hlsenc: export inner muxer timebase
- configure: add noexecstack to linker options if supported.
- avcodec/ac3enc_template: fix out of array read
- avutil/x86/cpu: fix cpuid sub-leaf selection
- avformat/img2dec: enable generic seeking for image pipes
- avformat/img2dec: initialize pkt->pos for image pipes
- avformat/img2dec: pass error code and signal EOF
- avformat/img2dec: fix error code at EOF for pipes
- libavutil/opt: fix av_opt_set_channel_layout() to access correct memory address
- tests/fate-run.sh: Cat .err file in case of error with V>0
- avformat/riffenc: Filter out "BottomUp" in ff_put_bmp_header()
- avcodec/webp: fix default palette color 0xff000000 -> 0x00000000
- avcodec/asvenc: fix AAN scaling
- Fix compile error on arm4/arm5 platform

2 files changed, 6 insertions, 6 deletions

diff --git a/multimedia/ffmpeg2/Makefile.common b/multimedia/ffmpeg2/Makefile.common
index 0a7ad90a134..4b68a55f4d8 100644
--- a/multimedia/ffmpeg2/Makefile.common
+++ b/multimedia/ffmpeg2/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.22 2014/10/01 16:09:16 wiz Exp $
+# $NetBSD: Makefile.common,v 1.23 2014/10/05 14:47:10 wiz Exp $
 # used by multimedia/ffmpeg2/Makefile
 # used by multimedia/ffplay2/Makefile
 
-DISTNAME=	ffmpeg-2.4.1
+DISTNAME=	ffmpeg-2.4.2
 CATEGORIES=	multimedia
 MASTER_SITES=	http://www.ffmpeg.org/releases/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/multimedia/ffmpeg2/distinfo b/multimedia/ffmpeg2/distinfo
index c43a2ff3a97..d9f01270607 100644
--- a/multimedia/ffmpeg2/distinfo
+++ b/multimedia/ffmpeg2/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.20 2014/10/01 16:09:16 wiz Exp $
+$NetBSD: distinfo,v 1.21 2014/10/05 14:47:10 wiz Exp $
 
-SHA1 (ffmpeg-2.4.1.tar.bz2) = 8cb1c03af61001edbd0d9643b2a01b7aa097a4b3
-RMD160 (ffmpeg-2.4.1.tar.bz2) = 9a88e2ec407c8696dbd4aeba309e68c948f60f22
-Size (ffmpeg-2.4.1.tar.bz2) = 7367864 bytes
+SHA1 (ffmpeg-2.4.2.tar.bz2) = 8fedc6f235d8510f716bca1784faa8cbe5d9cf78
+RMD160 (ffmpeg-2.4.2.tar.bz2) = 5cc0a5a36f3b4ab833d082f88bb2dba38f6550aa
+Size (ffmpeg-2.4.2.tar.bz2) = 7367100 bytes
 SHA1 (patch-Makefile) = ff8a7a5fdfd4987ef2835bd7360a78efd4310253
 SHA1 (patch-configure) = 42be64b0456c4d09d24db2535e22e948034ebd3c
 SHA1 (patch-libavutil_common.h) = ebbd0c169f228af37ae2dd54b27d5dba11a34c5e