March 2015 - ffmpeg-cvslog - lists.ffmpeg.org

lavf/segment: style nits
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Rodger Combs <rodger.combs(a)gmail.com> | Mon Mar 30 20:23:19 2015 -0600| [5cba5291a7675e960b34fe906ce47c8622d774ee] | committer: Michael Niedermayer lavf/segment: style nits Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5cba5291a7675e960… --- libavformat/segment.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/segment.c b/libavformat/segment.c index 7b8fdad..69038ca 100644 --- a/libavformat/segment.c +++ b/libavformat/segment.c @@ -226,7 +226,7 @@ static int segment_start(AVFormatContext *s, int write_header) } seg->segment_idx++; - if ((seg->segment_idx_wrap) && (seg->segment_idx%seg->segment_idx_wrap == 0)) + if ((seg->segment_idx_wrap) && (seg->segment_idx % seg->segment_idx_wrap == 0)) seg->segment_idx_wrap_nb++; if ((err = set_segment_filename(s)) < 0) @@ -761,7 +761,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) int64_t avgt = av_gettime(); time_t sec = avgt / 1000000; localtime_r(&sec, &ti); - usecs = (int64_t)(ti.tm_hour*3600 + ti.tm_min*60 + ti.tm_sec) * 1000000 + (avgt % 1000000); + usecs = (int64_t)(ti.tm_hour * 3600 + ti.tm_min * 60 + ti.tm_sec) * 1000000 + (avgt % 1000000); wrapped_val = usecs % seg->time; if (seg->last_cut != usecs && wrapped_val < seg->last_val) { seg->cut_pending = 1; @@ -769,7 +769,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) } seg->last_val = wrapped_val; } else { - end_pts = seg->time * (seg->segment_count+1); + end_pts = seg->time * (seg->segment_count + 1); } } @@ -797,7 +797,7 @@ static int seg_write_packet(AVFormatContext *s, AVPacket *pkt) goto fail; seg->cut_pending = 0; - seg->cur_entry.index = seg->segment_idx + seg->segment_idx_wrap*seg->segment_idx_wrap_nb; + seg->cur_entry.index = seg->segment_idx + seg->segment_idx_wrap * seg->segment_idx_wrap_nb; seg->cur_entry.start_time = (double)pkt->pts * av_q2d(st->time_base); seg->cur_entry.start_pts = av_rescale_q(pkt->pts, st->time_base, AV_TIME_BASE_Q); seg->cur_entry.end_time = seg->cur_entry.start_time +

1 0

avcodec/snowenc: Check av_frame_ref() return value
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Mar 31 04:25:42 2015 +0200| [385fe984fc6cd784812f46e784ddf51c58ab000d] | committer: Michael Niedermayer avcodec/snowenc: Check av_frame_ref() return value Fixes CID1026740 Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=385fe984fc6cd7848… --- libavcodec/snowenc.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/libavcodec/snowenc.c b/libavcodec/snowenc.c index e03dc13..d192d1c 100644 --- a/libavcodec/snowenc.c +++ b/libavcodec/snowenc.c @@ -1622,7 +1622,9 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, ff_snow_frame_start(s); av_frame_unref(avctx->coded_frame); - av_frame_ref(avctx->coded_frame, s->current_picture); + ret = av_frame_ref(avctx->coded_frame, s->current_picture); + if (ret < 0) + return ret; s->m.current_picture_ptr= &s->m.current_picture; s->m.current_picture.f = s->current_picture;

1 0

avcodec/h264_refs: fix null pointer dereference with -DTRACE
by git＠videolan.org 31 Mar '15

31 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Mar 31 01:57:00 2015 +0200| [a38758a97efe9c2de48b5429fd2fdebd55ba6a64] | committer: Michael Niedermayer avcodec/h264_refs: fix null pointer dereference with -DTRACE Found-by: carl Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a38758a97efe9c2de… --- libavcodec/h264_refs.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 27619d9..3519870 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -175,16 +175,16 @@ int ff_h264_fill_default_ref_list(H264Context *h, H264SliceContext *sl) #ifdef TRACE for (i = 0; i < sl->ref_count[0]; i++) { tprintf(h->avctx, "List0: %s fn:%d 0x%p\n", - (h->default_ref_list[0][i].parent->long_ref ? "LT" : "ST"), + h->default_ref_list[0][i].parent ? (h->default_ref_list[0][i].parent->long_ref ? "LT" : "ST") : "NULL", h->default_ref_list[0][i].pic_id, - h->default_ref_list[0][i].parent->f.data[0]); + h->default_ref_list[0][i].parent ? h->default_ref_list[0][i].parent->f.data[0] : 0); } if (sl->slice_type_nos == AV_PICTURE_TYPE_B) { for (i = 0; i < sl->ref_count[1]; i++) { tprintf(h->avctx, "List1: %s fn:%d 0x%p\n", - (h->default_ref_list[1][i].parent->long_ref ? "LT" : "ST"), + h->default_ref_list[1][i].parent ? (h->default_ref_list[1][i].parent->long_ref ? "LT" : "ST") : "NULL", h->default_ref_list[1][i].pic_id, - h->default_ref_list[1][i].parent->f.data[0]); + h->default_ref_list[1][i].parent ? h->default_ref_list[1][i].parent->f.data[0] : 0); } } #endif

1 0

Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8'
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Mar 31 01:02:00 2015 +0200| [a105931d3edfd47f287e47e858ef080f0199cd47] | committer: Michael Niedermayer Merge commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8' * commit '4978850ca2cb1ec6908f5bc79cc592ca454d11e8': build: Split JPEG-related tables off into a separate component Conflicts: configure Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a105931d3edfd47f2… ---

1 0

build: Split JPEG-related tables off into a separate component
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Fri Mar 27 12:23:59 2015 +0100| [4978850ca2cb1ec6908f5bc79cc592ca454d11e8] | committer: Diego Biurrun build: Split JPEG-related tables off into a separate component > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4978850ca2cb1ec69… --- configure | 14 +++++++---- libavcodec/Makefile | 12 +++++----- libavcodec/g2meet.c | 1 + libavcodec/{mjpeg.c => jpegtables.c} | 2 +- libavcodec/jpegtables.h | 43 ++++++++++++++++++++++++++++++++++ libavcodec/ljpegenc.c | 1 + libavcodec/mjpeg.h | 19 --------------- libavcodec/mjpeg2jpeg_bsf.c | 2 +- libavcodec/mjpegdec.c | 1 + libavcodec/mjpegenc.c | 1 + libavcodec/mjpegenc_common.c | 1 + libavformat/rtpdec_jpeg.c | 1 + 12 files changed, 66 insertions(+), 32 deletions(-) diff --git a/configure b/configure index 3eb701c..6ad813b 100755 --- a/configure +++ b/configure @@ -1590,6 +1590,7 @@ CONFIG_EXTRA=" iirfilter imdct15 intrax8 + jpegtables lgplv3 lpc me_cmp @@ -1826,7 +1827,7 @@ flv_encoder_select="h263_encoder" fourxm_decoder_select="blockdsp bswapdsp" fraps_decoder_select="bswapdsp huffman" g2m_decoder_deps="zlib" -g2m_decoder_select="blockdsp idctdsp" +g2m_decoder_select="blockdsp idctdsp jpegtables" h261_decoder_select="mpeg_er mpegvideo" h261_encoder_select="aandcttables mpegvideoenc" h263_decoder_select="error_resilience h263_parser h263dsp mpeg_er mpegvideo qpeldsp" @@ -1850,13 +1851,13 @@ jpegls_decoder_select="golomb mjpeg_decoder" jpegls_encoder_select="golomb" jv_decoder_select="blockdsp" lagarith_decoder_select="huffyuvdsp" -ljpeg_encoder_select="aandcttables idctdsp" +ljpeg_encoder_select="aandcttables idctdsp jpegtables" loco_decoder_select="golomb" mdec_decoder_select="blockdsp idctdsp mpegvideo" metasound_decoder_select="lsp mdct sinewin" mimic_decoder_select="blockdsp bswapdsp hpeldsp idctdsp" -mjpeg_decoder_select="blockdsp hpeldsp idctdsp" -mjpeg_encoder_select="aandcttables mpegvideoenc" +mjpeg_decoder_select="blockdsp hpeldsp idctdsp jpegtables" +mjpeg_encoder_select="aandcttables jpegtables mpegvideoenc" mjpegb_decoder_select="mjpeg_decoder" mlp_decoder_select="mlp_parser" motionpixels_decoder_select="bswapdsp" @@ -2017,6 +2018,9 @@ mpegvideo_parser_select="mpegvideo" mpeg4video_parser_select="error_resilience h263dsp mpeg_er mpegvideo qpeldsp" vc1_parser_select="mpegvideo startcode vc1_decoder" +# bitstream_filters +mjpeg2jpeg_bsf_select="jpegtables" + # external libraries libdcadec_decoder_deps="libdcadec" libfaac_encoder_deps="libfaac" @@ -2107,7 +2111,7 @@ ogg_demuxer_select="golomb" opus_muxer_select="ogg_muxer" psp_muxer_select="mov_muxer" rtp_demuxer_select="sdp_demuxer" -rtpdec_select="asf_demuxer rm_demuxer rtp_protocol mpegts_demuxer mov_demuxer" +rtpdec_select="asf_demuxer jpegtables mov_demuxer mpegts_demuxer rm_demuxer rtp_protocol" rtsp_demuxer_select="http_protocol rtpdec" rtsp_muxer_select="rtp_muxer http_protocol rtp_protocol rtpenc_chain" sap_demuxer_select="sdp_demuxer" diff --git a/libavcodec/Makefile b/libavcodec/Makefile index f5b23bb..8dd10c3 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -61,6 +61,7 @@ OBJS-$(CONFIG_IDCTDSP) += idctdsp.o simple_idct.o jrevdct.o OBJS-$(CONFIG_IIRFILTER) += iirfilter.o OBJS-$(CONFIG_IMDCT15) += imdct15.o OBJS-$(CONFIG_INTRAX8) += intrax8.o intrax8dsp.o +OBJS-$(CONFIG_JPEGTABLES) += jpegtables.o OBJS-$(CONFIG_LIBXVID) += libxvid_rc.o OBJS-$(CONFIG_LPC) += lpc.o OBJS-$(CONFIG_LSP) += lsp.o @@ -206,7 +207,7 @@ OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FRAPS_DECODER) += fraps.o OBJS-$(CONFIG_FRWU_DECODER) += frwu.o -OBJS-$(CONFIG_G2M_DECODER) += g2meet.o mjpeg.o +OBJS-$(CONFIG_G2M_DECODER) += g2meet.o OBJS-$(CONFIG_G723_1_DECODER) += g723_1.o acelp_vectors.o \ celp_filters.o OBJS-$(CONFIG_GIF_DECODER) += gifdec.o lzw.o @@ -252,7 +253,7 @@ OBJS-$(CONFIG_JV_DECODER) += jvdec.o OBJS-$(CONFIG_KGV1_DECODER) += kgv1dec.o OBJS-$(CONFIG_KMVC_DECODER) += kmvc.o OBJS-$(CONFIG_LAGARITH_DECODER) += lagarith.o lagarithrac.o -OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpeg.o mjpegenc_common.o +OBJS-$(CONFIG_LJPEG_ENCODER) += ljpegenc.o mjpegenc_common.o OBJS-$(CONFIG_LOCO_DECODER) += loco.o OBJS-$(CONFIG_MACE3_DECODER) += mace.o OBJS-$(CONFIG_MACE6_DECODER) += mace.o @@ -260,8 +261,8 @@ OBJS-$(CONFIG_MDEC_DECODER) += mdec.o mpeg12.o mpeg12data.o OBJS-$(CONFIG_METASOUND_DECODER) += metasound.o metasound_data.o \ twinvq.o OBJS-$(CONFIG_MIMIC_DECODER) += mimic.o -OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o mjpeg.o -OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpeg.o mjpegenc_common.o +OBJS-$(CONFIG_MJPEG_DECODER) += mjpegdec.o +OBJS-$(CONFIG_MJPEG_ENCODER) += mjpegenc.o mjpegenc_common.o OBJS-$(CONFIG_MJPEGB_DECODER) += mjpegbdec.o OBJS-$(CONFIG_MLP_DECODER) += mlpdec.o mlpdsp.o OBJS-$(CONFIG_MMVIDEO_DECODER) += mmvideo.o @@ -602,7 +603,6 @@ OBJS-$(CONFIG_OGG_DEMUXER) += mpeg12data.o \ dirac.o OBJS-$(CONFIG_OGG_MUXER) += flac.o flacdata.o OBJS-$(CONFIG_RTP_MUXER) += mpeg4audio.o -OBJS-$(CONFIG_RTPDEC) += mjpeg.o OBJS-$(CONFIG_SPDIF_DEMUXER) += aacadtsdec.o mpeg4audio.o OBJS-$(CONFIG_SPDIF_MUXER) += dca.o OBJS-$(CONFIG_TAK_DEMUXER) += tak.o @@ -703,7 +703,7 @@ OBJS-$(CONFIG_CHOMP_BSF) += chomp_bsf.o OBJS-$(CONFIG_DUMP_EXTRADATA_BSF) += dump_extradata_bsf.o OBJS-$(CONFIG_H264_MP4TOANNEXB_BSF) += h264_mp4toannexb_bsf.o OBJS-$(CONFIG_IMX_DUMP_HEADER_BSF) += imx_dump_header_bsf.o -OBJS-$(CONFIG_MJPEG2JPEG_BSF) += mjpeg2jpeg_bsf.o mjpeg.o +OBJS-$(CONFIG_MJPEG2JPEG_BSF) += mjpeg2jpeg_bsf.o OBJS-$(CONFIG_MJPEGA_DUMP_HEADER_BSF) += mjpega_dump_header_bsf.o OBJS-$(CONFIG_MOV2TEXTSUB_BSF) += movsub_bsf.o OBJS-$(CONFIG_NOISE_BSF) += noise_bsf.o diff --git a/libavcodec/g2meet.c b/libavcodec/g2meet.c index 33934f1..ddd7a1f 100644 --- a/libavcodec/g2meet.c +++ b/libavcodec/g2meet.c @@ -34,6 +34,7 @@ #include "idctdsp.h" #include "get_bits.h" #include "internal.h" +#include "jpegtables.h" #include "mjpeg.h" enum ChunkType { diff --git a/libavcodec/mjpeg.c b/libavcodec/jpegtables.c similarity index 99% rename from libavcodec/mjpeg.c rename to libavcodec/jpegtables.c index a353851..ce2bae2 100644 --- a/libavcodec/mjpeg.c +++ b/libavcodec/jpegtables.c @@ -30,7 +30,7 @@ * MJPEG encoder and decoder. */ -#include "mjpeg.h" +#include "jpegtables.h" #if 0 diff --git a/libavcodec/jpegtables.h b/libavcodec/jpegtables.h new file mode 100644 index 0000000..1a909be --- /dev/null +++ b/libavcodec/jpegtables.h @@ -0,0 +1,43 @@ +/* + * JPEG-related tables + * + * This file is part of Libav. + * + * Libav is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * Libav is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with Libav; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#ifndef AVCODEC_JPEGTABLES_H +#define AVCODEC_JPEGTABLES_H + +#include <stdint.h> + +#include "libavutil/internal.h" + +extern av_export const uint8_t avpriv_mjpeg_bits_dc_luminance[]; +extern av_export const uint8_t avpriv_mjpeg_val_dc[]; + +extern av_export const uint8_t avpriv_mjpeg_bits_dc_chrominance[]; + +extern av_export const uint8_t avpriv_mjpeg_bits_ac_luminance[]; +extern av_export const uint8_t avpriv_mjpeg_val_ac_luminance[]; + +extern av_export const uint8_t avpriv_mjpeg_bits_ac_chrominance[]; +extern av_export const uint8_t avpriv_mjpeg_val_ac_chrominance[]; + +void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, + const uint8_t *bits_table, + const uint8_t *val_table); + +#endif /* AVCODEC_JPEGTABLES_H */ diff --git a/libavcodec/ljpegenc.c b/libavcodec/ljpegenc.c index fbb024b..fc2ade6 100644 --- a/libavcodec/ljpegenc.c +++ b/libavcodec/ljpegenc.c @@ -37,6 +37,7 @@ #include "avcodec.h" #include "idctdsp.h" #include "internal.h" +#include "jpegtables.h" #include "mjpegenc_common.h" #include "mpegvideo.h" #include "mjpeg.h" diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index 39c9c32..1ebe283 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -33,10 +33,6 @@ #ifndef AVCODEC_MJPEG_H #define AVCODEC_MJPEG_H -#include "libavutil/internal.h" - -#include "avcodec.h" - /* JPEG marker codes */ enum JpegMarker { /* start of frame */ @@ -131,19 +127,4 @@ enum JpegMarker { case 7: ret= (left + top)>>1; break;\ } -extern av_export const uint8_t avpriv_mjpeg_bits_dc_luminance[]; -extern av_export const uint8_t avpriv_mjpeg_val_dc[]; - -extern av_export const uint8_t avpriv_mjpeg_bits_dc_chrominance[]; - -extern av_export const uint8_t avpriv_mjpeg_bits_ac_luminance[]; -extern av_export const uint8_t avpriv_mjpeg_val_ac_luminance[]; - -extern av_export const uint8_t avpriv_mjpeg_bits_ac_chrominance[]; -extern av_export const uint8_t avpriv_mjpeg_val_ac_chrominance[]; - -void ff_mjpeg_build_huffman_codes(uint8_t *huff_size, uint16_t *huff_code, - const uint8_t *bits_table, - const uint8_t *val_table); - #endif /* AVCODEC_MJPEG_H */ diff --git a/libavcodec/mjpeg2jpeg_bsf.c b/libavcodec/mjpeg2jpeg_bsf.c index 59734c9..d277934 100644 --- a/libavcodec/mjpeg2jpeg_bsf.c +++ b/libavcodec/mjpeg2jpeg_bsf.c @@ -30,7 +30,7 @@ #include "libavutil/mem.h" #include "avcodec.h" -#include "mjpeg.h" +#include "jpegtables.h" static const uint8_t jpeg_header[] = { 0xff, 0xd8, // SOI diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 12b0a41..3d72bbd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -38,6 +38,7 @@ #include "blockdsp.h" #include "idctdsp.h" #include "internal.h" +#include "jpegtables.h" #include "mjpeg.h" #include "mjpegdec.h" #include "jpeglsdec.h" diff --git a/libavcodec/mjpegenc.c b/libavcodec/mjpegenc.c index a460886..6724310 100644 --- a/libavcodec/mjpegenc.c +++ b/libavcodec/mjpegenc.c @@ -35,6 +35,7 @@ #include "libavutil/pixdesc.h" #include "avcodec.h" +#include "jpegtables.h" #include "mjpegenc_common.h" #include "mpegvideo.h" #include "mjpeg.h" diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index f2a829f..b1f2c00 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -27,6 +27,7 @@ #include "avcodec.h" #include "idctdsp.h" +#include "jpegtables.h" #include "put_bits.h" #include "mjpegenc.h" #include "mjpegenc_common.h" diff --git a/libavformat/rtpdec_jpeg.c b/libavformat/rtpdec_jpeg.c index 44121d4..3bee0b2 100644 --- a/libavformat/rtpdec_jpeg.c +++ b/libavformat/rtpdec_jpeg.c @@ -24,6 +24,7 @@ #include "rtpdec.h" #include "rtpdec_formats.h" #include "libavutil/intreadwrite.h" +#include "libavcodec/jpegtables.h" #include "libavcodec/mjpeg.h" #include "libavcodec/bytestream.h"

1 0

Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5'
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Tue Mar 31 00:47:40 2015 +0200| [48183f144d1d6f7af8e8526a2e020a6a88ad38c0] | committer: Michael Niedermayer Merge commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5' * commit '87f87ccf32055aca25fa08e29e22cca1ba9976d5': mjpeg: Use a more precise type for put_marker() Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=48183f144d1d6f7af… ---

1 0

mjpeg: Use a more precise type for put_marker()
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Sun Mar 29 13:24:18 2015 +0200| [87f87ccf32055aca25fa08e29e22cca1ba9976d5] | committer: Diego Biurrun mjpeg: Use a more precise type for put_marker() > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=87f87ccf32055aca2… --- libavcodec/mjpeg.h | 4 ++-- libavcodec/mjpegenc.h | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index 8b7bf8d..39c9c32 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -38,7 +38,7 @@ #include "avcodec.h" /* JPEG marker codes */ -typedef enum { +enum JpegMarker { /* start of frame */ SOF0 = 0xc0, /* baseline */ SOF1 = 0xc1, /* extended sequential, huffman */ @@ -117,7 +117,7 @@ typedef enum { TEM = 0x01, /* temporary private use for arithmetic coding */ /* 0x02 -> 0xbf reserved */ -} JPEG_MARKER; +}; #define PREDICT(ret, topleft, top, left, predictor)\ switch(predictor){\ diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index eec4d25..aa8697e 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -35,6 +35,7 @@ #include <stdint.h> +#include "mjpeg.h" #include "mpegvideo.h" #include "put_bits.h" @@ -50,7 +51,7 @@ typedef struct MJpegContext { uint16_t huff_code_ac_chrominance[256]; } MJpegContext; -static inline void put_marker(PutBitContext *p, int code) +static inline void put_marker(PutBitContext *p, enum JpegMarker code) { put_bits(p, 8, 0xff); put_bits(p, 8, code);

1 0

avutil/hmac: Check av_hmac_alloc() return code
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 23:07:19 2015 +0200| [21ee6da70c4e5a56ea74aec0f8d21465a873b874] | committer: Michael Niedermayer avutil/hmac: Check av_hmac_alloc() return code Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=21ee6da70c4e5a56e… --- libavutil/hmac.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavutil/hmac.c b/libavutil/hmac.c index 300436c..b63d1b2 100644 --- a/libavutil/hmac.c +++ b/libavutil/hmac.c @@ -245,6 +245,8 @@ int main(void) /* SHA-2 */ while (i <= AV_HMAC_SHA512) { hmac = av_hmac_alloc(i); + if (!hmac) + return 1; // RFC 4231 test vectors test(hmac, key1, sizeof(key1), data1, sizeof(data1)); test(hmac, key2, sizeof(key2), data2, sizeof(data2));

1 0

swresample/swresample: Use av_mallocz_array()
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 22:59:09 2015 +0200| [1a10134e20efcda2666fb6f3488b2cda8c7756dc] | committer: Michael Niedermayer swresample/swresample: Use av_mallocz_array() Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a10134e20efcda26… --- libswresample/swresample.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libswresample/swresample.c b/libswresample/swresample.c index 9baccd2..c2be82c 100644 --- a/libswresample/swresample.c +++ b/libswresample/swresample.c @@ -352,7 +352,7 @@ int swri_realloc_audio(AudioData *a, int count){ av_assert0(a->bps); av_assert0(a->ch_count); - a->data= av_mallocz(countb*a->ch_count); + a->data= av_mallocz_array(countb, a->ch_count); if(!a->data) return AVERROR(ENOMEM); for(i=0; i<a->ch_count; i++){

1 0

lavf: Bump minor version and document directory listing API in doc/ APIchanges.
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Mariusz Szczepańczyk <mszczepanczyk(a)gmail.com> | Sun Mar 29 00:54:46 2015 +0100| [f613f238f9dd366b296294b0e441697e3a90bf5d] | committer: Lukasz Marek lavf: Bump minor version and document directory listing API in doc/APIchanges. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f613f238f9dd366b2… --- doc/APIchanges | 9 +++++++++ libavformat/version.h | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/doc/APIchanges b/doc/APIchanges index 8e35437..f8dcc99 100644 --- a/doc/APIchanges +++ b/doc/APIchanges @@ -15,6 +15,15 @@ libavutil: 2014-08-09 API changes, most recent first: +2015-03-27 - 184084c - lavf 56.27.100 - avio.h url.h + New directory listing API. + + Add AVIODirEntryType enum. + Add AVIODirEntry, AVIODirContext structures. + Add avio_open_dir(), avio_read_dir(), avio_close_dir(), avio_free_directory_entry(). + Add ff_alloc_dir_entry(). + Extend URLProtocol with url_open_dir(), url_read_dir(), url_close_dir(). + 2015-xx-xx - xxxxxxx - lavu 54.21.100 / 54.10.0 Add AV_PIX_FMT_MMAL for MMAL hardware acceleration. diff --git a/libavformat/version.h b/libavformat/version.h index a183d7f..82a57ee 100644 --- a/libavformat/version.h +++ b/libavformat/version.h @@ -30,8 +30,8 @@ #include "libavutil/version.h" #define LIBAVFORMAT_VERSION_MAJOR 56 -#define LIBAVFORMAT_VERSION_MINOR 26 -#define LIBAVFORMAT_VERSION_MICRO 101 +#define LIBAVFORMAT_VERSION_MINOR 27 +#define LIBAVFORMAT_VERSION_MICRO 100 #define LIBAVFORMAT_VERSION_INT AV_VERSION_INT(LIBAVFORMAT_VERSION_MAJOR, \ LIBAVFORMAT_VERSION_MINOR, \

1 0