Re: [FFmpeg-devel] [PATCH] lavf/oggenc: use meaningful error codes

2014-12-03 Thread Lukasz Marek 

On 03.12.2014 01:10, Michael Niedermayer wrote:

On Wed, Dec 03, 2014 at 12:36:23AM +0100, Lukasz Marek wrote:

Signed-off-by: Lukasz Marek 
---
  libavformat/oggenc.c | 10 +-
  1 file changed, 5 insertions(+), 5 deletions(-)


LGTM


pushed

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

Re: [FFmpeg-devel] [PATCH] lavf/oggenc: use meaningful error codes

2014-12-02 Thread Michael Niedermayer 
On Wed, Dec 03, 2014 at 12:36:23AM +0100, Lukasz Marek wrote:
> Signed-off-by: Lukasz Marek 
> ---
>  libavformat/oggenc.c | 10 +-
>  1 file changed, 5 insertions(+), 5 deletions(-)

LGTM

[...]
-- 
Michael GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

Its not that you shouldnt use gotos but rather that you should write
readable code and code with gotos often but not always is less readable


signature.asc
Description: Digital signature
___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel

[FFmpeg-devel] [PATCH] lavf/oggenc: use meaningful error codes

2014-12-02 Thread Lukasz Marek 
Signed-off-by: Lukasz Marek 
---
 libavformat/oggenc.c | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavformat/oggenc.c b/libavformat/oggenc.c
index dda229e..f3413c5 100644
--- a/libavformat/oggenc.c
+++ b/libavformat/oggenc.c
@@ -348,7 +348,7 @@ static int ogg_build_speex_headers(AVCodecContext *avctx,
 uint8_t *p;
 
 if (avctx->extradata_size < SPEEX_HEADER_SIZE)
-return -1;
+return AVERROR_INVALIDDATA;
 
 // first packet: Speex header
 p = av_mallocz(SPEEX_HEADER_SIZE);
@@ -377,7 +377,7 @@ static int ogg_build_opus_headers(AVCodecContext *avctx,
 uint8_t *p;
 
 if (avctx->extradata_size < OPUS_HEADER_SIZE)
-return -1;
+return AVERROR_INVALIDDATA;
 
 /* first packet: Opus header */
 p = av_mallocz(avctx->extradata_size);
@@ -446,12 +446,12 @@ static int ogg_write_header(AVFormatContext *s)
 st->codec->codec_id != AV_CODEC_ID_FLAC   &&
 st->codec->codec_id != AV_CODEC_ID_OPUS) {
 av_log(s, AV_LOG_ERROR, "Unsupported codec id in stream %d\n", i);
-return -1;
+return AVERROR(EINVAL);
 }
 
 if (!st->codec->extradata || !st->codec->extradata_size) {
 av_log(s, AV_LOG_ERROR, "No extradata present\n");
-return -1;
+return AVERROR_INVALIDDATA;
 }
 oggstream = av_mallocz(sizeof(*oggstream));
 if (!oggstream)
@@ -511,7 +511,7 @@ static int ogg_write_header(AVFormatContext *s)
   oggstream->header, 
oggstream->header_len) < 0) {
 av_log(s, AV_LOG_ERROR, "Extradata corrupted\n");
 av_freep(&st->priv_data);
-return -1;
+return AVERROR_INVALIDDATA;
 }
 
 p = ogg_write_vorbiscomment(7, s->flags & AVFMT_FLAG_BITEXACT,
-- 
1.9.1

___
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel