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

avcodec/libdcadec: remove av_assert and check bits_per_sample more completely
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Sun Mar 29 13:12:07 2015 +0200| [fda8b7ec7de6a6a1188a922a8878752798a4ee8d] | committer: Michael Niedermayer avcodec/libdcadec: remove av_assert and check bits_per_sample more completely Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fda8b7ec7de6a6a11… --- libavcodec/libdcadec.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/libdcadec.c b/libavcodec/libdcadec.c index 6e89262..3ac4bcb 100644 --- a/libavcodec/libdcadec.c +++ b/libavcodec/libdcadec.c @@ -21,7 +21,6 @@ #include <libdcadec/dca_context.h> -#include "libavutil/avassert.h" #include "libavutil/channel_layout.h" #include "libavutil/common.h" #include "libavutil/opt.h" @@ -80,10 +79,9 @@ static int dcadec_decode_frame(AVCodecContext *avctx, void *data, avctx->channel_layout = channel_mask; avctx->sample_rate = sample_rate; - av_assert0(bits_per_sample >= 16); if (bits_per_sample == 16) avctx->sample_fmt = AV_SAMPLE_FMT_S16P; - else if (bits_per_sample <= 24) + else if (bits_per_sample > 16 && bits_per_sample <= 24) avctx->sample_fmt = AV_SAMPLE_FMT_S32P; else { av_log(avctx, AV_LOG_ERROR, "Unsupported number of bits per sample: %d\n",

1 0

avfilter/vf_vignette: Change enum to int, which is accessed via AVOption as int
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 21:58:42 2015 +0200| [1019a1cb0ac29fe6a84113d3a6f8c5c30a70fffa] | committer: Michael Niedermayer avfilter/vf_vignette: Change enum to int, which is accessed via AVOption as int This fixes depending on implementation defined behavior Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1019a1cb0ac29fe6a… --- libavfilter/vf_vignette.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/libavfilter/vf_vignette.c b/libavfilter/vf_vignette.c index 806bd72..5f4c5fa 100644 --- a/libavfilter/vf_vignette.c +++ b/libavfilter/vf_vignette.c @@ -51,11 +51,17 @@ enum var_name { VAR_NB }; +enum EvalMode { + EVAL_MODE_INIT, + EVAL_MODE_FRAME, + EVAL_MODE_NB +}; + typedef struct { const AVClass *class; const AVPixFmtDescriptor *desc; int backward; - enum EvalMode { EVAL_MODE_INIT, EVAL_MODE_FRAME, EVAL_MODE_NB } eval_mode; + int eval_mode; ///< EvalMode #define DEF_EXPR_FIELDS(name) AVExpr *name##_pexpr; char *name##_expr; double name DEF_EXPR_FIELDS(angle); DEF_EXPR_FIELDS(x0);

1 0

avdevice/avfoundation: Fix occured typo
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 21:41:17 2015 +0200| [63167a6ba3433b7edffe9bf7236a4f4a8f8dba9f] | committer: Michael Niedermayer avdevice/avfoundation: Fix occured typo Signed-off-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=63167a6ba3433b7ed… --- libavdevice/avfoundation.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavdevice/avfoundation.m b/libavdevice/avfoundation.m index 5140ecb..763e675 100644 --- a/libavdevice/avfoundation.m +++ b/libavdevice/avfoundation.m @@ -408,7 +408,7 @@ static int add_video_device(AVFormatContext *s, AVCaptureDevice *video_device) } } @catch (NSException *exception) { if (![[exception name] isEqualToString:NSUndefinedKeyException]) { - av_log (s, AV_LOG_ERROR, "An error occured: %s", [exception.reason UTF8String]); + av_log (s, AV_LOG_ERROR, "An error occurred: %s", [exception.reason UTF8String]); return AVERROR_EXTERNAL; } }

1 0

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

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 21:05:23 2015 +0200| [794e9fb5a649b4489e7369eb846049d4a03f3ff9] | committer: Michael Niedermayer Merge commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80' * commit 'e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80': mjpeg: Move code only used in the encoder(s) to the appropriate header Conflicts: libavcodec/mjpegdec.c Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=794e9fb5a649b4489… ---

1 0

mjpeg: Move code only used in the encoder(s) to the appropriate header
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Fri Mar 27 12:53:56 2015 +0100| [e6e3dcba0c6f11bd7022e2d3b9bcb7b6a09d6c80] | committer: Diego Biurrun mjpeg: Move code only used in the encoder(s) to the appropriate header > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6e3dcba0c6f11bd7… --- libavcodec/jpeglsenc.c | 1 + libavcodec/mjpeg.h | 7 ------- libavcodec/mjpegdec.c | 1 + libavcodec/mjpegenc.h | 7 +++++++ libavcodec/mjpegenc_common.c | 1 + 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libavcodec/jpeglsenc.c b/libavcodec/jpeglsenc.c index 3af6412..f7dec30 100644 --- a/libavcodec/jpeglsenc.c +++ b/libavcodec/jpeglsenc.c @@ -31,6 +31,7 @@ #include "internal.h" #include "mathops.h" #include "mjpeg.h" +#include "mjpegenc.h" #include "jpegls.h" /** diff --git a/libavcodec/mjpeg.h b/libavcodec/mjpeg.h index bd3b1e8..8b7bf8d 100644 --- a/libavcodec/mjpeg.h +++ b/libavcodec/mjpeg.h @@ -36,7 +36,6 @@ #include "libavutil/internal.h" #include "avcodec.h" -#include "put_bits.h" /* JPEG marker codes */ typedef enum { @@ -120,12 +119,6 @@ typedef enum { /* 0x02 -> 0xbf reserved */ } JPEG_MARKER; -static inline void put_marker(PutBitContext *p, int code) -{ - put_bits(p, 8, 0xff); - put_bits(p, 8, code); -} - #define PREDICT(ret, topleft, top, left, predictor)\ switch(predictor){\ case 1: ret= left; break;\ diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 82cee48..12b0a41 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -41,6 +41,7 @@ #include "mjpeg.h" #include "mjpegdec.h" #include "jpeglsdec.h" +#include "put_bits.h" static int build_vlc(VLC *vlc, const uint8_t *bits_table, diff --git a/libavcodec/mjpegenc.h b/libavcodec/mjpegenc.h index a4d684c..eec4d25 100644 --- a/libavcodec/mjpegenc.h +++ b/libavcodec/mjpegenc.h @@ -36,6 +36,7 @@ #include <stdint.h> #include "mpegvideo.h" +#include "put_bits.h" typedef struct MJpegContext { uint8_t huff_size_dc_luminance[12]; //FIXME use array [3] instead of lumi / chrom, for easier addressing @@ -49,6 +50,12 @@ typedef struct MJpegContext { uint16_t huff_code_ac_chrominance[256]; } MJpegContext; +static inline void put_marker(PutBitContext *p, int code) +{ + put_bits(p, 8, 0xff); + put_bits(p, 8, code); +} + int ff_mjpeg_encode_init(MpegEncContext *s); void ff_mjpeg_encode_close(MpegEncContext *s); void ff_mjpeg_encode_mb(MpegEncContext *s, int16_t block[8][64]); diff --git a/libavcodec/mjpegenc_common.c b/libavcodec/mjpegenc_common.c index adb335e..f2a829f 100644 --- a/libavcodec/mjpegenc_common.c +++ b/libavcodec/mjpegenc_common.c @@ -28,6 +28,7 @@ #include "avcodec.h" #include "idctdsp.h" #include "put_bits.h" +#include "mjpegenc.h" #include "mjpegenc_common.h" #include "mjpeg.h"

1 0

Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098'
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 20:54:08 2015 +0200| [847c0d333b6a195670f5bd64e9f7e5c9cf254cc4] | committer: Michael Niedermayer Merge commit '6ed38b1f65b424a4fa92042e0069f350b95e0098' * commit '6ed38b1f65b424a4fa92042e0069f350b95e0098': tiff: Return more meaningful error codes Conflicts: libavcodec/tiffenc.c See: 0187c2ccda3b00d22797170bf5675318dd0f675a Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=847c0d333b6a19567… ---

1 0

tiff: Return more meaningful error codes
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Himangi Saraogi <himangi774(a)gmail.com> | Mon Mar 30 00:45:56 2015 +0530| [6ed38b1f65b424a4fa92042e0069f350b95e0098] | committer: Diego Biurrun tiff: Return more meaningful error codes Signed-off-by: Diego Biurrun <diego(a)biurrun.de> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6ed38b1f65b424a4f… --- libavcodec/tiffenc.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/libavcodec/tiffenc.c b/libavcodec/tiffenc.c index 169360f..a020f5f 100644 --- a/libavcodec/tiffenc.c +++ b/libavcodec/tiffenc.c @@ -153,7 +153,8 @@ static int add_entry1(TiffEncoderContext *s, * @param dst Output buffer * @param n Size of input buffer * @param compr Compression method - * @return Number of output bytes. If an output error is encountered, -1 returned + * @return Number of output bytes. If an output error is encountered, a negative + * value corresponding to an AVERROR error code is returned. */ static int encode_strip(TiffEncoderContext *s, const int8_t *src, uint8_t *dst, int n, int compr) @@ -166,14 +167,14 @@ static int encode_strip(TiffEncoderContext *s, const int8_t *src, unsigned long zlen = s->buf_size - (*s->buf - s->buf_start); if (compress(dst, &zlen, src, n) != Z_OK) { av_log(s->avctx, AV_LOG_ERROR, "Compressing failed\n"); - return -1; + return AVERROR_UNKNOWN; } return zlen; } #endif case TIFF_RAW: if (check_size(s, n)) - return -1; + return AVERROR(EINVAL); memcpy(dst, src, n); return n; case TIFF_PACKBITS: @@ -182,7 +183,7 @@ static int encode_strip(TiffEncoderContext *s, const int8_t *src, case TIFF_LZW: return ff_lzw_encode(s->lzws, src, n); default: - return -1; + return AVERROR(EINVAL); } } @@ -291,7 +292,7 @@ static int encode_frame(AVCodecContext *avctx, AVPacket *pkt, default: av_log(s->avctx, AV_LOG_ERROR, "This colors format is not supported\n"); - return -1; + return AVERROR(EINVAL); } if (s->compr == TIFF_DEFLATE ||

1 0

Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18'
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 20:39:01 2015 +0200| [98263d751562e3b8cefa6d06eb95f0dee8a205db] | committer: Michael Niedermayer Merge commit '23944d29a22a2cd602753b3705f73011c3bf0b18' * commit '23944d29a22a2cd602753b3705f73011c3bf0b18': indeo: Give Indeo4/5 shared code a more consistent name Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=98263d751562e3b8c… ---

1 0

indeo: Give Indeo4/5 shared code a more consistent name
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Diego Biurrun <diego(a)biurrun.de> | Sun Mar 29 14:44:23 2015 +0200| [23944d29a22a2cd602753b3705f73011c3bf0b18] | committer: Diego Biurrun indeo: Give Indeo4/5 shared code a more consistent name > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=23944d29a22a2cd60… --- libavcodec/Makefile | 4 ++-- libavcodec/indeo4.c | 2 +- libavcodec/indeo4data.h | 3 +-- libavcodec/indeo5.c | 2 +- libavcodec/{ivi_common.c => ivi.c} | 2 +- libavcodec/{ivi_common.h => ivi.h} | 6 +++--- libavcodec/ivi_dsp.c | 2 +- libavcodec/ivi_dsp.h | 5 +++-- 8 files changed, 13 insertions(+), 13 deletions(-) diff --git a/libavcodec/Makefile b/libavcodec/Makefile index 39158f3..f5b23bb 100644 --- a/libavcodec/Makefile +++ b/libavcodec/Makefile @@ -240,8 +240,8 @@ OBJS-$(CONFIG_IFF_ILBM_DECODER) += iff.o OBJS-$(CONFIG_IMC_DECODER) += imc.o OBJS-$(CONFIG_INDEO2_DECODER) += indeo2.o OBJS-$(CONFIG_INDEO3_DECODER) += indeo3.o -OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi_common.o ivi_dsp.o -OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi_common.o ivi_dsp.o +OBJS-$(CONFIG_INDEO4_DECODER) += indeo4.o ivi.o ivi_dsp.o +OBJS-$(CONFIG_INDEO5_DECODER) += indeo5.o ivi.o ivi_dsp.o OBJS-$(CONFIG_INTERPLAY_DPCM_DECODER) += dpcm.o OBJS-$(CONFIG_INTERPLAY_VIDEO_DECODER) += interplayvideo.o OBJS-$(CONFIG_JPEG2000_DECODER) += jpeg2000dec.o jpeg2000.o jpeg2000dsp.o \ diff --git a/libavcodec/indeo4.c b/libavcodec/indeo4.c index 35f266e..92f3062 100644 --- a/libavcodec/indeo4.c +++ b/libavcodec/indeo4.c @@ -30,8 +30,8 @@ #define BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" +#include "ivi.h" #include "ivi_dsp.h" -#include "ivi_common.h" #include "indeo4data.h" #define IVI4_PIC_SIZE_ESC 7 diff --git a/libavcodec/indeo4data.h b/libavcodec/indeo4data.h index 8311c68..be7c413 100644 --- a/libavcodec/indeo4data.h +++ b/libavcodec/indeo4data.h @@ -29,8 +29,7 @@ #include <stdint.h> -#include "ivi_common.h" -#include "mathops.h" +#include "ivi.h" /** * standard picture dimensions diff --git a/libavcodec/indeo5.c b/libavcodec/indeo5.c index 5a112f9..2d00c23 100644 --- a/libavcodec/indeo5.c +++ b/libavcodec/indeo5.c @@ -30,8 +30,8 @@ #define BITSTREAM_READER_LE #include "avcodec.h" #include "get_bits.h" +#include "ivi.h" #include "ivi_dsp.h" -#include "ivi_common.h" #include "indeo5data.h" /** diff --git a/libavcodec/ivi_common.c b/libavcodec/ivi.c similarity index 99% rename from libavcodec/ivi_common.c rename to libavcodec/ivi.c index 7c4d53e..ce1e5aa 100644 --- a/libavcodec/ivi_common.c +++ b/libavcodec/ivi.c @@ -35,7 +35,7 @@ #include "get_bits.h" #include "internal.h" #include "mathops.h" -#include "ivi_common.h" +#include "ivi.h" #include "ivi_dsp.h" /** diff --git a/libavcodec/ivi_common.h b/libavcodec/ivi.h similarity index 99% rename from libavcodec/ivi_common.h rename to libavcodec/ivi.h index e2cc593..5dadd9f 100644 --- a/libavcodec/ivi_common.h +++ b/libavcodec/ivi.h @@ -26,8 +26,8 @@ * Indeo5 decoders. */ -#ifndef AVCODEC_IVI_COMMON_H -#define AVCODEC_IVI_COMMON_H +#ifndef AVCODEC_IVI_H +#define AVCODEC_IVI_H #include "avcodec.h" #include "get_bits.h" @@ -340,4 +340,4 @@ int ff_ivi_decode_frame(AVCodecContext *avctx, void *data, int *got_frame, AVPacket *avpkt); int ff_ivi_decode_close(AVCodecContext *avctx); -#endif /* AVCODEC_IVI_COMMON_H */ +#endif /* AVCODEC_IVI_H */ diff --git a/libavcodec/ivi_dsp.c b/libavcodec/ivi_dsp.c index ecc49b3..7d12784 100644 --- a/libavcodec/ivi_dsp.c +++ b/libavcodec/ivi_dsp.c @@ -27,7 +27,7 @@ */ #include "avcodec.h" -#include "ivi_common.h" +#include "ivi.h" #include "ivi_dsp.h" void ff_ivi_recompose53(const IVIPlaneDesc *plane, uint8_t *dst, diff --git a/libavcodec/ivi_dsp.h b/libavcodec/ivi_dsp.h index 11c2f5c..45c8a18 100644 --- a/libavcodec/ivi_dsp.h +++ b/libavcodec/ivi_dsp.h @@ -29,8 +29,9 @@ #ifndef AVCODEC_IVI_DSP_H #define AVCODEC_IVI_DSP_H -#include "avcodec.h" -#include "ivi_common.h" +#include <stdint.h> + +#include "ivi.h" /** * 5/3 wavelet recomposition filter for Indeo5

1 0

Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161'
by git＠videolan.org 30 Mar '15

30 Mar '15

ffmpeg | branch: master | Michael Niedermayer <michaelni(a)gmx.at> | Mon Mar 30 20:31:50 2015 +0200| [f5c7531ab1e69210df69b07ac6b21cb675f13b9e] | committer: Michael Niedermayer Merge commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161' * commit '7d3183d3a4e800ab7a7fa24f49968a1b1bcc0161': qsv: Skip header compilation depending on what parts of qsv are enabled Conflicts: libavcodec/Makefile Merged-by: Michael Niedermayer <michaelni(a)gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f5c7531ab1e69210d… ---

1 0