Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Replace all occurrences of AVERROR_NOMEM with AVERROR(ENOMEM).

Browse Source 
Originally committed as revision 9759 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Panagiotis Issaris 18 years ago
parent 390d5a7cad
commit 769e10f068
42 changed files with 105 additions and 105 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      cmdutils.c
  2. 8
      libavformat/4xm.c
  3. 2
      libavformat/aiff.c
  4. 2
      libavformat/amr.c
  5. 4
      libavformat/apc.c
  6. 4
      libavformat/avs.c
  7. 8
      libavformat/bethsoftvid.c
  8. 4
      libavformat/c93.c
  9. 8
      libavformat/dsicin.c
  10. 4
      libavformat/dxa.c
  11. 4
      libavformat/electronicarts.c
  12. 2
      libavformat/flic.c
  13. 4
      libavformat/flvdec.c
  14. 4
      libavformat/idcin.c
  15. 4
      libavformat/idroq.c
  16. 6
      libavformat/ipmovie.c
  17. 14
      libavformat/matroskadec.c
  18. 8
      libavformat/mm.c
  19. 2
      libavformat/mmf.c
  20. 2
      libavformat/mp3.c
  21. 2
      libavformat/mpc.c
  22. 4
      libavformat/mtv.c
  23. 2
      libavformat/nut.c
  24. 2
      libavformat/nutdec.c
  25. 2
      libavformat/ogg.c
  26. 2
      libavformat/ogg2.c
  27. 4
      libavformat/psxstr.c
  28. 14
      libavformat/raw.c
  29. 4
      libavformat/rtsp.c
  30. 8
      libavformat/segafilm.c
  31. 8
      libavformat/sierravmd.c
  32. 4
      libavformat/smacker.c
  33. 4
      libavformat/thp.c
  34. 8
      libavformat/tiertexseq.c
  35. 2
      libavformat/tta.c
  36. 2
      libavformat/txd.c
  37. 26
      libavformat/utils.c
  38. 2
      libavformat/vocdec.c
  39. 2
      libavformat/wav.c
  40. 4
      libavformat/wc3movie.c
  41. 6
      libavformat/westwood.c
  42. 2
      libavformat/wv.c

2
cmdutils.c
Unescape View File

@ -138,7 +138,7 @@ void print_error(const char *filename, int err)
"Usually that means that input file is truncated and/or corrupted.\n", "Usually that means that input file is truncated and/or corrupted.\n",
filename); filename);
break; break;
case AVERROR_NOMEM: case AVERROR(ENOMEM):
fprintf(stderr, "%s: memory allocation error occured\n", filename); fprintf(stderr, "%s: memory allocation error occured\n", filename);
break; break;
case AVERROR_NOENT: case AVERROR_NOENT:

8
libavformat/4xm.c
Unescape View File

@ -116,7 +116,7 @@ static int fourxm_read_header(AVFormatContext *s,
/* allocate space for the header and load the whole thing */ /* allocate space for the header and load the whole thing */
header = av_malloc(header_size); header = av_malloc(header_size);
if (!header) if (!header)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
if (get_buffer(pb, header, header_size) != header_size) if (get_buffer(pb, header, header_size) != header_size)
return AVERROR_IO; return AVERROR_IO;
@ -140,7 +140,7 @@ static int fourxm_read_header(AVFormatContext *s,
/* allocate a new AVStream */ /* allocate a new AVStream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 60, 1, fourxm->fps); av_set_pts_info(st, 60, 1, fourxm->fps);
fourxm->video_stream_index = st->index; fourxm->video_stream_index = st->index;
@ -166,7 +166,7 @@ static int fourxm_read_header(AVFormatContext *s,
fourxm->track_count * sizeof(AudioTrack)); fourxm->track_count * sizeof(AudioTrack));
if (!fourxm->tracks) { if (!fourxm->tracks) {
av_free(header); av_free(header);
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} }
} }
fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]); fourxm->tracks[current_track].adpcm = AV_RL32(&header[i + 12]);
@ -178,7 +178,7 @@ static int fourxm_read_header(AVFormatContext *s,
/* allocate a new AVStream */ /* allocate a new AVStream */
st = av_new_stream(s, current_track); st = av_new_stream(s, current_track);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate); av_set_pts_info(st, 60, 1, fourxm->tracks[current_track].sample_rate);

2
libavformat/aiff.c
Unescape View File

@ -312,7 +312,7 @@ static int aiff_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
while (filesize > 0) { while (filesize > 0) {
/* parse different chunks */ /* parse different chunks */

2
libavformat/amr.c
Unescape View File

@ -87,7 +87,7 @@ static int amr_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
{ {
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} }
if(memcmp(header,AMR_header,6)!=0) if(memcmp(header,AMR_header,6)!=0)
{ {

4
libavformat/apc.c
Unescape View File

@ -41,7 +41,7 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS; st->codec->codec_id = CODEC_ID_ADPCM_IMA_WS;
@ -53,7 +53,7 @@ static int apc_read_header(AVFormatContext *s, AVFormatParameters *ap)
st->codec->extradata = av_malloc(st->codec->extradata_size + st->codec->extradata = av_malloc(st->codec->extradata_size +
FF_INPUT_BUFFER_PADDING_SIZE); FF_INPUT_BUFFER_PADDING_SIZE);
if (!st->codec->extradata) if (!st->codec->extradata)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
/* initial predictor values for adpcm decoder */ /* initial predictor values for adpcm decoder */
get_buffer(pb, st->codec->extradata, 2 * 4); get_buffer(pb, st->codec->extradata, 2 * 4);

4
libavformat/avs.c
Unescape View File

@ -176,7 +176,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
if (!avs->st_video) { if (!avs->st_video) {
avs->st_video = av_new_stream(s, AVS_VIDEO); avs->st_video = av_new_stream(s, AVS_VIDEO);
if (avs->st_video == NULL) if (avs->st_video == NULL)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
avs->st_video->codec->codec_type = CODEC_TYPE_VIDEO; avs->st_video->codec->codec_type = CODEC_TYPE_VIDEO;
avs->st_video->codec->codec_id = CODEC_ID_AVS; avs->st_video->codec->codec_id = CODEC_ID_AVS;
avs->st_video->codec->width = avs->width; avs->st_video->codec->width = avs->width;
@ -193,7 +193,7 @@ static int avs_read_packet(AVFormatContext * s, AVPacket * pkt)
if (!avs->st_audio) { if (!avs->st_audio) {
avs->st_audio = av_new_stream(s, AVS_AUDIO); avs->st_audio = av_new_stream(s, AVS_AUDIO);
if (avs->st_audio == NULL) if (avs->st_audio == NULL)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
avs->st_audio->codec->codec_type = CODEC_TYPE_AUDIO; avs->st_audio->codec->codec_type = CODEC_TYPE_AUDIO;
} }
avs->remaining_audio_size = size - 4; avs->remaining_audio_size = size - 4;

8
libavformat/bethsoftvid.c
Unescape View File

@ -71,7 +71,7 @@ static int vid_read_header(AVFormatContext *s,
stream = av_new_stream(s, 0); stream = av_new_stream(s, 0);
if (!stream) if (!stream)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(stream, 32, 1, 60); // 16 ms increments, i.e. 60 fps av_set_pts_info(stream, 32, 1, 60); // 16 ms increments, i.e. 60 fps
stream->codec->codec_type = CODEC_TYPE_VIDEO; stream->codec->codec_type = CODEC_TYPE_VIDEO;
stream->codec->codec_id = CODEC_ID_BETHSOFTVID; stream->codec->codec_id = CODEC_ID_BETHSOFTVID;
@ -84,7 +84,7 @@ static int vid_read_header(AVFormatContext *s,
// done with video codec, set up audio codec // done with video codec, set up audio codec
stream = av_new_stream(s, 0); stream = av_new_stream(s, 0);
if (!stream) if (!stream)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
stream->codec->codec_type = CODEC_TYPE_AUDIO; stream->codec->codec_type = CODEC_TYPE_AUDIO;
stream->codec->codec_id = CODEC_ID_PCM_U8; stream->codec->codec_id = CODEC_ID_PCM_U8;
stream->codec->channels = 1; stream->codec->channels = 1;
@ -108,7 +108,7 @@ static int read_frame(BVID_DemuxContext *vid, ByteIOContext *pb, AVPacket *pkt,
vidbuf_start = av_malloc(vidbuf_capacity = BUFFER_PADDING_SIZE); vidbuf_start = av_malloc(vidbuf_capacity = BUFFER_PADDING_SIZE);
if(!vidbuf_start) if(!vidbuf_start)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
// save the file position for the packet, include block type // save the file position for the packet, include block type
position = url_ftell(pb) - 1; position = url_ftell(pb) - 1;
@ -128,7 +128,7 @@ static int read_frame(BVID_DemuxContext *vid, ByteIOContext *pb, AVPacket *pkt,
do{ do{
vidbuf_start = av_fast_realloc(vidbuf_start, &vidbuf_capacity, vidbuf_nbytes + BUFFER_PADDING_SIZE); vidbuf_start = av_fast_realloc(vidbuf_start, &vidbuf_capacity, vidbuf_nbytes + BUFFER_PADDING_SIZE);
if(!vidbuf_start) if(!vidbuf_start)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
code = get_byte(pb); code = get_byte(pb);
vidbuf_start[vidbuf_nbytes++] = code; vidbuf_start[vidbuf_nbytes++] = code;

4
libavformat/c93.c
Unescape View File

@ -77,7 +77,7 @@ static int read_header(AVFormatContext *s,
video = av_new_stream(s, 0); video = av_new_stream(s, 0);
if (!video) if (!video)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
video->codec->codec_type = CODEC_TYPE_VIDEO; video->codec->codec_type = CODEC_TYPE_VIDEO;
video->codec->codec_id = CODEC_ID_C93; video->codec->codec_id = CODEC_ID_C93;
@ -115,7 +115,7 @@ static int read_packet(AVFormatContext *s, AVPacket *pkt)
if (!c93->audio) { if (!c93->audio) {
c93->audio = av_new_stream(s, 1); c93->audio = av_new_stream(s, 1);
if (!c93->audio) if (!c93->audio)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
c93->audio->codec->codec_type = CODEC_TYPE_AUDIO; c93->audio->codec->codec_type = CODEC_TYPE_AUDIO;
} }
url_fskip(pb, 26); /* VOC header */ url_fskip(pb, 26); /* VOC header */

8
libavformat/dsicin.c
Unescape View File

@ -108,7 +108,7 @@ static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* initialize the video decoder stream */ /* initialize the video decoder stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 32, 1, 12); av_set_pts_info(st, 32, 1, 12);
cin->video_stream_index = st->index; cin->video_stream_index = st->index;
@ -121,7 +121,7 @@ static int cin_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* initialize the audio decoder stream */ /* initialize the audio decoder stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 32, 1, 22050); av_set_pts_info(st, 32, 1, 22050);
cin->audio_stream_index = st->index; cin->audio_stream_index = st->index;
@ -178,7 +178,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
pkt_size = (palette_type + 3) * hdr->pal_colors_count + hdr->video_frame_size; pkt_size = (palette_type + 3) * hdr->pal_colors_count + hdr->video_frame_size;
if (av_new_packet(pkt, 4 + pkt_size)) if (av_new_packet(pkt, 4 + pkt_size))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
pkt->stream_index = cin->video_stream_index; pkt->stream_index = cin->video_stream_index;
pkt->pts = cin->video_stream_pts++; pkt->pts = cin->video_stream_pts++;
@ -198,7 +198,7 @@ static int cin_read_packet(AVFormatContext *s, AVPacket *pkt)
/* audio packet */ /* audio packet */
if (av_new_packet(pkt, cin->audio_buffer_size)) if (av_new_packet(pkt, cin->audio_buffer_size))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
pkt->stream_index = cin->audio_stream_index; pkt->stream_index = cin->audio_stream_index;
pkt->pts = cin->audio_stream_pts; pkt->pts = cin->audio_stream_pts;

4
libavformat/dxa.c
Unescape View File

@ -160,7 +160,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
switch(AV_RL32(buf)){ switch(AV_RL32(buf)){
case MKTAG('N', 'U', 'L', 'L'): case MKTAG('N', 'U', 'L', 'L'):
if(av_new_packet(pkt, 4 + pal_size) < 0) if(av_new_packet(pkt, 4 + pal_size) < 0)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
pkt->stream_index = 0; pkt->stream_index = 0;
if(pal_size) memcpy(pkt->data, pal, pal_size); if(pal_size) memcpy(pkt->data, pal, pal_size);
memcpy(pkt->data + pal_size, buf, 4); memcpy(pkt->data + pal_size, buf, 4);
@ -181,7 +181,7 @@ static int dxa_read_packet(AVFormatContext *s, AVPacket *pkt)
return -1; return -1;
} }
if(av_new_packet(pkt, size + DXA_EXTRA_SIZE + pal_size) < 0) if(av_new_packet(pkt, size + DXA_EXTRA_SIZE + pal_size) < 0)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
memcpy(pkt->data + pal_size, buf, DXA_EXTRA_SIZE); memcpy(pkt->data + pal_size, buf, DXA_EXTRA_SIZE);
ret = get_buffer(&s->pb, pkt->data + DXA_EXTRA_SIZE + pal_size, size); ret = get_buffer(&s->pb, pkt->data + DXA_EXTRA_SIZE + pal_size, size);
if(ret != size){ if(ret != size){

4
libavformat/electronicarts.c
Unescape View File

@ -184,7 +184,7 @@ static int ea_read_header(AVFormatContext *s,
/* initialize the video decoder stream */ /* initialize the video decoder stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
ea->video_stream_index = st->index; ea->video_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
@ -195,7 +195,7 @@ static int ea_read_header(AVFormatContext *s,
/* initialize the audio decoder stream */ /* initialize the audio decoder stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, EA_SAMPLE_RATE); av_set_pts_info(st, 33, 1, EA_SAMPLE_RATE);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_ADPCM_EA; st->codec->codec_id = CODEC_ID_ADPCM_EA;

2
libavformat/flic.c
Unescape View File

@ -86,7 +86,7 @@ static int flic_read_header(AVFormatContext *s,
/* initialize the decoder streams */ /* initialize the decoder streams */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
flic->video_stream_index = st->index; flic->video_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_FLIC; st->codec->codec_id = CODEC_ID_FLIC;

4
libavformat/flvdec.c
Unescape View File

@ -237,14 +237,14 @@ static int flv_read_header(AVFormatContext *s,
if(flags & FLV_HEADER_FLAG_HASVIDEO){ if(flags & FLV_HEADER_FLAG_HASVIDEO){
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */ av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
} }
if(flags & FLV_HEADER_FLAG_HASAUDIO){ if(flags & FLV_HEADER_FLAG_HASAUDIO){
st = av_new_stream(s, 1); st = av_new_stream(s, 1);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */ av_set_pts_info(st, 24, 1, 1000); /* 24 bit pts in ms */
} }

4
libavformat/idcin.c
Unescape View File

@ -151,7 +151,7 @@ static int idcin_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
idcin->video_stream_index = st->index; idcin->video_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
@ -174,7 +174,7 @@ static int idcin_read_header(AVFormatContext *s,
idcin->audio_present = 1; idcin->audio_present = 1;
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
idcin->audio_stream_index = st->index; idcin->audio_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;

4
libavformat/idroq.c
Unescape View File

@ -140,7 +140,7 @@ static int roq_read_header(AVFormatContext *s,
/* initialize the decoders */ /* initialize the decoders */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
/* set the pts reference (1 pts = 1/90000) */ /* set the pts reference (1 pts = 1/90000) */
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
roq->video_stream_index = st->index; roq->video_stream_index = st->index;
@ -153,7 +153,7 @@ static int roq_read_header(AVFormatContext *s,
if (roq->audio_channels) { if (roq->audio_channels) {
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
roq->audio_stream_index = st->index; roq->audio_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;

6
libavformat/ipmovie.c
Unescape View File

@ -551,7 +551,7 @@ static int ipmovie_read_header(AVFormatContext *s,
/* initialize the stream decoders */ /* initialize the stream decoders */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
ipmovie->video_stream_index = st->index; ipmovie->video_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
@ -566,7 +566,7 @@ static int ipmovie_read_header(AVFormatContext *s,
if (ipmovie->audio_type) { if (ipmovie->audio_type) {
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
ipmovie->audio_stream_index = st->index; ipmovie->audio_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
@ -598,7 +598,7 @@ static int ipmovie_read_packet(AVFormatContext *s,
else if (ret == CHUNK_EOF) else if (ret == CHUNK_EOF)
ret = AVERROR_IO; ret = AVERROR_IO;
else if (ret == CHUNK_NOMEM) else if (ret == CHUNK_NOMEM)
ret = AVERROR_NOMEM; ret = AVERROR(ENOMEM);
else if (ret == CHUNK_VIDEO) else if (ret == CHUNK_VIDEO)
ret = 0; ret = 0;
else else

14
libavformat/matroskadec.c
Unescape View File

@ -485,7 +485,7 @@ ebml_read_ascii (MatroskaDemuxContext *matroska,
* byte more, read the string and NULL-terminate it ourselves. */ * byte more, read the string and NULL-terminate it ourselves. */
if (size < 0 || !(*str = av_malloc(size + 1))) { if (size < 0 || !(*str = av_malloc(size + 1))) {
av_log(matroska->ctx, AV_LOG_ERROR, "Memory allocation failed\n"); av_log(matroska->ctx, AV_LOG_ERROR, "Memory allocation failed\n");
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} }
if (get_buffer(pb, (uint8_t *) *str, size) != size) { if (get_buffer(pb, (uint8_t *) *str, size) != size) {
offset_t pos = url_ftell(pb); offset_t pos = url_ftell(pb);
@ -581,7 +581,7 @@ ebml_read_binary (MatroskaDemuxContext *matroska,
if (!(*binary = av_malloc(*size))) { if (!(*binary = av_malloc(*size))) {
av_log(matroska->ctx, AV_LOG_ERROR, av_log(matroska->ctx, AV_LOG_ERROR,
"Memory allocation error\n"); "Memory allocation error\n");
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} }
if (get_buffer(pb, *binary, *size) != *size) { if (get_buffer(pb, *binary, *size) != *size) {
@ -2074,7 +2074,7 @@ matroska_read_header (AVFormatContext *s,
int sri = matroska_aac_sri(audiotrack->internal_samplerate); int sri = matroska_aac_sri(audiotrack->internal_samplerate);
extradata = av_malloc(5); extradata = av_malloc(5);
if (extradata == NULL) if (extradata == NULL)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
extradata[0] = (profile << 3) | ((sri&0x0E) >> 1); extradata[0] = (profile << 3) | ((sri&0x0E) >> 1);
extradata[1] = ((sri&0x01) << 7) | (audiotrack->channels<<3); extradata[1] = ((sri&0x01) << 7) | (audiotrack->channels<<3);
if (strstr(track->codec_id, "SBR")) { if (strstr(track->codec_id, "SBR")) {
@ -2095,7 +2095,7 @@ matroska_read_header (AVFormatContext *s,
extradata_size = 30; extradata_size = 30;
extradata = av_mallocz(extradata_size); extradata = av_mallocz(extradata_size);
if (extradata == NULL) if (extradata == NULL)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
init_put_byte(&b, extradata, extradata_size, 1, init_put_byte(&b, extradata, extradata_size, 1,
NULL, NULL, NULL, NULL); NULL, NULL, NULL, NULL);
put_buffer(&b, (uint8_t *) "TTA1", 4); put_buffer(&b, (uint8_t *) "TTA1", 4);
@ -2164,7 +2164,7 @@ matroska_read_header (AVFormatContext *s,
matroska->num_streams++; matroska->num_streams++;
st = av_new_stream(s, track->stream_index); st = av_new_stream(s, track->stream_index);
if (st == NULL) if (st == NULL)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 64, matroska->time_scale, 1000*1000*1000); /* 64 bit pts in ns */ av_set_pts_info(st, 64, matroska->time_scale, 1000*1000*1000); /* 64 bit pts in ns */
st->codec->codec_id = codec_id; st->codec->codec_id = codec_id;
@ -2182,7 +2182,7 @@ matroska_read_header (AVFormatContext *s,
} else if(track->codec_priv && track->codec_priv_size > 0){ } else if(track->codec_priv && track->codec_priv_size > 0){
st->codec->extradata = av_malloc(track->codec_priv_size); st->codec->extradata = av_malloc(track->codec_priv_size);
if(st->codec->extradata == NULL) if(st->codec->extradata == NULL)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->extradata_size = track->codec_priv_size; st->codec->extradata_size = track->codec_priv_size;
memcpy(st->codec->extradata,track->codec_priv+extradata_offset, memcpy(st->codec->extradata,track->codec_priv+extradata_offset,
track->codec_priv_size); track->codec_priv_size);
@ -2451,7 +2451,7 @@ matroska_parse_block(MatroskaDemuxContext *matroska, uint8_t *data, int size,
pkt = av_mallocz(sizeof(AVPacket)); pkt = av_mallocz(sizeof(AVPacket));
/* XXX: prevent data copy... */ /* XXX: prevent data copy... */
if (av_new_packet(pkt, slice_size-offset) < 0) { if (av_new_packet(pkt, slice_size-offset) < 0) {
res = AVERROR_NOMEM; res = AVERROR(ENOMEM);
n = laces-1; n = laces-1;
break; break;
} }

8
libavformat/mm.c
Unescape View File

@ -95,7 +95,7 @@ static int mm_read_header(AVFormatContext *s,
/* video stream */ /* video stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_MMVIDEO; st->codec->codec_id = CODEC_ID_MMVIDEO;
st->codec->codec_tag = 0; /* no fourcc */ st->codec->codec_tag = 0; /* no fourcc */
@ -108,7 +108,7 @@ static int mm_read_header(AVFormatContext *s,
if (length == MM_HEADER_LEN_AV) { if (length == MM_HEADER_LEN_AV) {
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_tag = 0; /* no fourcc */ st->codec->codec_tag = 0; /* no fourcc */
st->codec->codec_id = CODEC_ID_PCM_U8; st->codec->codec_id = CODEC_ID_PCM_U8;
@ -168,7 +168,7 @@ static int mm_read_packet(AVFormatContext *s,
case MM_TYPE_INTER_HHV : case MM_TYPE_INTER_HHV :
/* output preamble + data */ /* output preamble + data */
if (av_new_packet(pkt, length + MM_PREAMBLE_SIZE)) if (av_new_packet(pkt, length + MM_PREAMBLE_SIZE))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
memcpy(pkt->data, preamble, MM_PREAMBLE_SIZE); memcpy(pkt->data, preamble, MM_PREAMBLE_SIZE);
if (get_buffer(pb, pkt->data + MM_PREAMBLE_SIZE, length) != length) if (get_buffer(pb, pkt->data + MM_PREAMBLE_SIZE, length) != length)
return AVERROR_IO; return AVERROR_IO;
@ -179,7 +179,7 @@ static int mm_read_packet(AVFormatContext *s,
case MM_TYPE_AUDIO : case MM_TYPE_AUDIO :
if (av_get_packet(&s->pb, pkt, length)<0) if (av_get_packet(&s->pb, pkt, length)<0)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
pkt->size = length; pkt->size = length;
pkt->stream_index = 1; pkt->stream_index = 1;
pkt->pts = mm->audio_pts++; pkt->pts = mm->audio_pts++;

2
libavformat/mmf.c
Unescape View File

@ -242,7 +242,7 @@ static int mmf_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_ADPCM_YAMAHA; st->codec->codec_id = CODEC_ID_ADPCM_YAMAHA;

2
libavformat/mp3.c
Unescape View File

@ -433,7 +433,7 @@ static int mp3_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_MP3; st->codec->codec_id = CODEC_ID_MP3;

2
libavformat/mpc.c
Unescape View File

@ -92,7 +92,7 @@ static int mpc_read_header(AVFormatContext *s, AVFormatParameters *ap)
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_MUSEPACK7; st->codec->codec_id = CODEC_ID_MUSEPACK7;
st->codec->channels = 2; st->codec->channels = 2;

4
libavformat/mtv.c
Unescape View File

@ -96,7 +96,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
st = av_new_stream(s, VIDEO_SID); st = av_new_stream(s, VIDEO_SID);
if(!st) if(!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 64, 1, mtv->video_fps); av_set_pts_info(st, 64, 1, mtv->video_fps);
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
@ -111,7 +111,7 @@ static int mtv_read_header(AVFormatContext *s, AVFormatParameters *ap)
st = av_new_stream(s, AUDIO_SID); st = av_new_stream(s, AUDIO_SID);
if(!st) if(!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 64, 1, AUDIO_SAMPLING_RATE); av_set_pts_info(st, 64, 1, AUDIO_SAMPLING_RATE);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;

2
libavformat/nut.c
Unescape View File

@ -952,7 +952,7 @@ static int decode_stream_header(NUTContext *nut){
st = av_new_stream(s, stream_id); st = av_new_stream(s, stream_id);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
class = get_v(bc); class = get_v(bc);
tmp = get_vb(bc); tmp = get_vb(bc);

2
libavformat/nutdec.c
Unescape View File

@ -293,7 +293,7 @@ static int decode_stream_header(NUTContext *nut){
st = s->streams[stream_id]; st = s->streams[stream_id];
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
class = get_v(bc); class = get_v(bc);
tmp = get_fourcc(bc); tmp = get_fourcc(bc);

2
libavformat/ogg.c
Unescape View File

@ -216,7 +216,7 @@ static int ogg_read_header(AVFormatContext *avfcontext, AVFormatParameters *ap)
ast = av_new_stream(avfcontext, 0) ; ast = av_new_stream(avfcontext, 0) ;
if(!ast) if(!ast)
return AVERROR_NOMEM ; return AVERROR(ENOMEM) ;
av_set_pts_info(ast, 60, 1, AV_TIME_BASE); av_set_pts_info(ast, 60, 1, AV_TIME_BASE);
codec= &ast->codec; codec= &ast->codec;

2
libavformat/ogg2.c
Unescape View File

@ -200,7 +200,7 @@ ogg_new_stream (AVFormatContext * s, uint32_t serial)
st = av_new_stream (s, idx); st = av_new_stream (s, idx);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 64, 1, 1000000); av_set_pts_info(st, 64, 1, 1000000);

4
libavformat/psxstr.c
Unescape View File

@ -178,7 +178,7 @@ static int str_read_header(AVFormatContext *s,
/* allocate a new AVStream */ /* allocate a new AVStream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 64, 1, 15); av_set_pts_info(st, 64, 1, 15);
str->channels[channel].video_stream_index = st->index; str->channels[channel].video_stream_index = st->index;
@ -207,7 +207,7 @@ static int str_read_header(AVFormatContext *s,
/* allocate a new AVStream */ /* allocate a new AVStream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 64, 128, str->channels[channel].sample_rate); av_set_pts_info(st, 64, 128, str->channels[channel].sample_rate);
str->channels[channel].audio_stream_index = st->index; str->channels[channel].audio_stream_index = st->index;

14
libavformat/raw.c
Unescape View File

@ -72,7 +72,7 @@ static int raw_read_header(AVFormatContext *s, AVFormatParameters *ap)
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
id = s->iformat->value; id = s->iformat->value;
if (id == CODEC_ID_RAWVIDEO) { if (id == CODEC_ID_RAWVIDEO) {
@ -222,7 +222,7 @@ static int ac3_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_AC3; st->codec->codec_id = CODEC_ID_AC3;
@ -238,7 +238,7 @@ static int shorten_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_SHORTEN; st->codec->codec_id = CODEC_ID_SHORTEN;
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
@ -254,7 +254,7 @@ static int flac_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_FLAC; st->codec->codec_id = CODEC_ID_FLAC;
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;
@ -270,7 +270,7 @@ static int dts_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_DTS; st->codec->codec_id = CODEC_ID_DTS;
@ -287,7 +287,7 @@ static int aac_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_AAC; st->codec->codec_id = CODEC_ID_AAC;
@ -304,7 +304,7 @@ static int video_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = s->iformat->value; st->codec->codec_id = s->iformat->value;

4
libavformat/rtsp.c
Unescape View File

@ -1044,7 +1044,7 @@ static int rtsp_read_header(AVFormatContext *s,
rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data);
if (!rtsp_st->rtp_ctx) { if (!rtsp_st->rtp_ctx) {
err = AVERROR_NOMEM; err = AVERROR(ENOMEM);
goto fail; goto fail;
} else { } else {
if(rtsp_st->dynamic_handler) { if(rtsp_st->dynamic_handler) {
@ -1384,7 +1384,7 @@ static int sdp_read_header(AVFormatContext *s,
s->ctx_flags |= AVFMTCTX_NOHEADER; s->ctx_flags |= AVFMTCTX_NOHEADER;
rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data); rtsp_st->rtp_ctx = rtp_parse_open(s, st, rtsp_st->rtp_handle, rtsp_st->sdp_payload_type, &rtsp_st->rtp_payload_data);
if (!rtsp_st->rtp_ctx) { if (!rtsp_st->rtp_ctx) {
err = AVERROR_NOMEM; err = AVERROR(ENOMEM);
goto fail; goto fail;
} else { } else {
if(rtsp_st->dynamic_handler) { if(rtsp_st->dynamic_handler) {

8
libavformat/segafilm.c
Unescape View File

@ -130,7 +130,7 @@ static int film_read_header(AVFormatContext *s,
if (film->video_type) { if (film->video_type) {
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
film->video_stream_index = st->index; film->video_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = film->video_type; st->codec->codec_id = film->video_type;
@ -142,7 +142,7 @@ static int film_read_header(AVFormatContext *s,
if (film->audio_type) { if (film->audio_type) {
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
film->audio_stream_index = st->index; film->audio_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = film->audio_type; st->codec->codec_id = film->audio_type;
@ -223,14 +223,14 @@ static int film_read_packet(AVFormatContext *s,
(film->video_type == CODEC_ID_CINEPAK)) { (film->video_type == CODEC_ID_CINEPAK)) {
pkt->pos= url_ftell(pb); pkt->pos= url_ftell(pb);
if (av_new_packet(pkt, sample->sample_size)) if (av_new_packet(pkt, sample->sample_size))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
get_buffer(pb, pkt->data, sample->sample_size); get_buffer(pb, pkt->data, sample->sample_size);
} else if ((sample->stream == film->audio_stream_index) && } else if ((sample->stream == film->audio_stream_index) &&
(film->audio_channels == 2)) { (film->audio_channels == 2)) {
/* stereo PCM needs to be interleaved */ /* stereo PCM needs to be interleaved */
if (av_new_packet(pkt, sample->sample_size)) if (av_new_packet(pkt, sample->sample_size))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
/* make sure the interleave buffer is large enough */ /* make sure the interleave buffer is large enough */
if (sample->sample_size > film->stereo_buffer_size) { if (sample->sample_size > film->stereo_buffer_size) {

8
libavformat/sierravmd.c
Unescape View File

@ -94,7 +94,7 @@ static int vmd_read_header(AVFormatContext *s,
/* start up the decoders */ /* start up the decoders */
vst = av_new_stream(s, 0); vst = av_new_stream(s, 0);
if (!vst) if (!vst)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(vst, 33, 1, 10); av_set_pts_info(vst, 33, 1, 10);
vmd->video_stream_index = vst->index; vmd->video_stream_index = vst->index;
vst->codec->codec_type = CODEC_TYPE_VIDEO; vst->codec->codec_type = CODEC_TYPE_VIDEO;
@ -111,7 +111,7 @@ static int vmd_read_header(AVFormatContext *s,
if (vmd->sample_rate) { if (vmd->sample_rate) {
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
vmd->audio_stream_index = st->index; vmd->audio_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_VMDAUDIO; st->codec->codec_id = CODEC_ID_VMDAUDIO;
@ -155,7 +155,7 @@ static int vmd_read_header(AVFormatContext *s,
if (!raw_frame_table || !vmd->frame_table) { if (!raw_frame_table || !vmd->frame_table) {
av_free(raw_frame_table); av_free(raw_frame_table);
av_free(vmd->frame_table); av_free(vmd->frame_table);
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} }
if (get_buffer(pb, raw_frame_table, raw_frame_table_size) != if (get_buffer(pb, raw_frame_table, raw_frame_table_size) !=
raw_frame_table_size) { raw_frame_table_size) {
@ -257,7 +257,7 @@ static int vmd_read_packet(AVFormatContext *s,
url_fseek(pb, frame->frame_offset, SEEK_SET); url_fseek(pb, frame->frame_offset, SEEK_SET);
if (av_new_packet(pkt, frame->frame_size + BYTES_PER_FRAME_RECORD)) if (av_new_packet(pkt, frame->frame_size + BYTES_PER_FRAME_RECORD))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
pkt->pos= url_ftell(pb); pkt->pos= url_ftell(pb);
memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD); memcpy(pkt->data, frame->frame_record, BYTES_PER_FRAME_RECORD);
ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD, ret = get_buffer(pb, pkt->data + BYTES_PER_FRAME_RECORD,

4
libavformat/smacker.c
Unescape View File

@ -290,7 +290,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt)
flags >>= 1; flags >>= 1;
} }
if (av_new_packet(pkt, frame_size + 768)) if (av_new_packet(pkt, frame_size + 768))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
if(smk->frm_size[smk->cur_frame] & 1) if(smk->frm_size[smk->cur_frame] & 1)
palchange |= 2; palchange |= 2;
pkt->data[0] = palchange; pkt->data[0] = palchange;
@ -304,7 +304,7 @@ static int smacker_read_packet(AVFormatContext *s, AVPacket *pkt)
smk->nextpos = url_ftell(&s->pb); smk->nextpos = url_ftell(&s->pb);
} else { } else {
if (av_new_packet(pkt, smk->buf_sizes[smk->curstream])) if (av_new_packet(pkt, smk->buf_sizes[smk->curstream]))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
memcpy(pkt->data, smk->bufs[smk->curstream], smk->buf_sizes[smk->curstream]); memcpy(pkt->data, smk->bufs[smk->curstream], smk->buf_sizes[smk->curstream]);
pkt->size = smk->buf_sizes[smk->curstream]; pkt->size = smk->buf_sizes[smk->curstream];
pkt->stream_index = smk->stream_id[smk->curstream]; pkt->stream_index = smk->stream_id[smk->curstream];

4
libavformat/thp.c
Unescape View File

@ -96,7 +96,7 @@ static int thp_read_header(AVFormatContext *s,
/* Video component. */ /* Video component. */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
/* The denominator and numerator are switched because 1/fps /* The denominator and numerator are switched because 1/fps
is required. */ is required. */
@ -119,7 +119,7 @@ static int thp_read_header(AVFormatContext *s,
/* Audio component. */ /* Audio component. */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = CODEC_ID_ADPCM_THP; st->codec->codec_id = CODEC_ID_ADPCM_THP;

8
libavformat/tiertexseq.c
Unescape View File

@ -95,7 +95,7 @@ static int seq_init_frame_buffers(SeqDemuxContext *seq, ByteIOContext *pb)
seq_buffer->data_size = sz; seq_buffer->data_size = sz;
seq_buffer->data = av_malloc(sz); seq_buffer->data = av_malloc(sz);
if (!seq_buffer->data) if (!seq_buffer->data)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} }
} }
seq->frame_buffers_count = i; seq->frame_buffers_count = i;
@ -208,7 +208,7 @@ static int seq_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* initialize the video decoder stream */ /* initialize the video decoder stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 32, 1, SEQ_FRAME_RATE); av_set_pts_info(st, 32, 1, SEQ_FRAME_RATE);
seq->video_stream_index = st->index; seq->video_stream_index = st->index;
@ -221,7 +221,7 @@ static int seq_read_header(AVFormatContext *s, AVFormatParameters *ap)
/* initialize the audio decoder stream */ /* initialize the audio decoder stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 32, 1, SEQ_SAMPLE_RATE); av_set_pts_info(st, 32, 1, SEQ_SAMPLE_RATE);
seq->audio_stream_index = st->index; seq->audio_stream_index = st->index;
@ -251,7 +251,7 @@ static int seq_read_packet(AVFormatContext *s, AVPacket *pkt)
/* video packet */ /* video packet */
if (seq->current_pal_data_size + seq->current_video_data_size != 0) { if (seq->current_pal_data_size + seq->current_video_data_size != 0) {
if (av_new_packet(pkt, 1 + seq->current_pal_data_size + seq->current_video_data_size)) if (av_new_packet(pkt, 1 + seq->current_pal_data_size + seq->current_video_data_size))
return AVERROR_NOMEM; return AVERROR(ENOMEM);
pkt->data[0] = 0; pkt->data[0] = 0;
if (seq->current_pal_data_size != 0) { if (seq->current_pal_data_size != 0) {

2
libavformat/tta.c
Unescape View File

@ -71,7 +71,7 @@ static int tta_read_header(AVFormatContext *s, AVFormatParameters *ap)
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 64, 1, samplerate); av_set_pts_info(st, 64, 1, samplerate);
st->start_time = 0; st->start_time = 0;

2
libavformat/txd.c
Unescape View File

@ -41,7 +41,7 @@ static int txd_read_header(AVFormatContext *s, AVFormatParameters *ap) {
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
st->codec->codec_id = CODEC_ID_TXD; st->codec->codec_id = CODEC_ID_TXD;
st->codec->time_base.den = 5; st->codec->time_base.den = 5;

26
libavformat/utils.c
Unescape View File

@ -195,10 +195,10 @@ int av_new_packet(AVPacket *pkt, int size)
{ {
uint8_t *data; uint8_t *data;
if((unsigned)size > (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE) if((unsigned)size > (unsigned)size + FF_INPUT_BUFFER_PADDING_SIZE)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE); data = av_malloc(size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!data) if (!data)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(data + size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
av_init_packet(pkt); av_init_packet(pkt);
@ -233,10 +233,10 @@ int av_dup_packet(AVPacket *pkt)
/* we duplicate the packet and don't forget to put the padding /* we duplicate the packet and don't forget to put the padding
again */ again */
if((unsigned)pkt->size > (unsigned)pkt->size + FF_INPUT_BUFFER_PADDING_SIZE) if((unsigned)pkt->size > (unsigned)pkt->size + FF_INPUT_BUFFER_PADDING_SIZE)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
data = av_malloc(pkt->size + FF_INPUT_BUFFER_PADDING_SIZE); data = av_malloc(pkt->size + FF_INPUT_BUFFER_PADDING_SIZE);
if (!data) { if (!data) {
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} }
memcpy(data, pkt->data, pkt->size); memcpy(data, pkt->data, pkt->size);
memset(data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE); memset(data + pkt->size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
@ -358,7 +358,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
else else
ic = *ic_ptr; ic = *ic_ptr;
if (!ic) { if (!ic) {
err = AVERROR_NOMEM; err = AVERROR(ENOMEM);
goto fail; goto fail;
} }
ic->iformat = fmt; ic->iformat = fmt;
@ -372,7 +372,7 @@ int av_open_input_stream(AVFormatContext **ic_ptr,
if (fmt->priv_data_size > 0) { if (fmt->priv_data_size > 0) {
ic->priv_data = av_mallocz(fmt->priv_data_size); ic->priv_data = av_mallocz(fmt->priv_data_size);
if (!ic->priv_data) { if (!ic->priv_data) {
err = AVERROR_NOMEM; err = AVERROR(ENOMEM);
goto fail; goto fail;
} }
} else { } else {
@ -868,13 +868,13 @@ int av_read_frame(AVFormatContext *s, AVPacket *pkt)
/* duplicate the packet */ /* duplicate the packet */
if (av_dup_packet(pkt) < 0) if (av_dup_packet(pkt) < 0)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
while(*plast_pktl) plast_pktl= &(*plast_pktl)->next; //FIXME maybe maintain pointer to the last? while(*plast_pktl) plast_pktl= &(*plast_pktl)->next; //FIXME maybe maintain pointer to the last?
pktl = av_mallocz(sizeof(AVPacketList)); pktl = av_mallocz(sizeof(AVPacketList));
if (!pktl) if (!pktl)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
/* add the packet in the buffered packet list */ /* add the packet in the buffered packet list */
*plast_pktl = pktl; *plast_pktl = pktl;
@ -1727,7 +1727,7 @@ int av_find_stream_info(AVFormatContext *ic)
int codec_identified[MAX_STREAMS]={0}; int codec_identified[MAX_STREAMS]={0};
duration_error = av_mallocz(MAX_STREAMS * sizeof(*duration_error)); duration_error = av_mallocz(MAX_STREAMS * sizeof(*duration_error));
if (!duration_error) return AVERROR_NOMEM; if (!duration_error) return AVERROR(ENOMEM);
for(i=0;i<ic->nb_streams;i++) { for(i=0;i<ic->nb_streams;i++) {
st = ic->streams[i]; st = ic->streams[i];
@ -1807,7 +1807,7 @@ int av_find_stream_info(AVFormatContext *ic)
pktl = av_mallocz(sizeof(AVPacketList)); pktl = av_mallocz(sizeof(AVPacketList));
if (!pktl) { if (!pktl) {
ret = AVERROR_NOMEM; ret = AVERROR(ENOMEM);
break; break;
} }
@ -1820,7 +1820,7 @@ int av_find_stream_info(AVFormatContext *ic)
/* duplicate the packet */ /* duplicate the packet */
if (av_dup_packet(pkt) < 0) { if (av_dup_packet(pkt) < 0) {
ret = AVERROR_NOMEM; ret = AVERROR(ENOMEM);
break; break;
} }
@ -2088,7 +2088,7 @@ int av_set_parameters(AVFormatContext *s, AVFormatParameters *ap)
if (s->oformat->priv_data_size > 0) { if (s->oformat->priv_data_size > 0) {
s->priv_data = av_mallocz(s->oformat->priv_data_size); s->priv_data = av_mallocz(s->oformat->priv_data_size);
if (!s->priv_data) if (!s->priv_data)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} else } else
s->priv_data = NULL; s->priv_data = NULL;
@ -2143,7 +2143,7 @@ int av_write_header(AVFormatContext *s)
if (!s->priv_data && s->oformat->priv_data_size > 0) { if (!s->priv_data && s->oformat->priv_data_size > 0) {
s->priv_data = av_mallocz(s->oformat->priv_data_size); s->priv_data = av_mallocz(s->oformat->priv_data_size);
if (!s->priv_data) if (!s->priv_data)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
} }
if(s->oformat->write_header){ if(s->oformat->write_header){

2
libavformat/vocdec.c
Unescape View File

@ -52,7 +52,7 @@ static int voc_read_header(AVFormatContext *s, AVFormatParameters *ap)
url_fskip(pb, header_size); url_fskip(pb, header_size);
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
voc->remaining_size = 0; voc->remaining_size = 0;

2
libavformat/wav.c
Unescape View File

@ -176,7 +176,7 @@ static int wav_read_header(AVFormatContext *s,
return -1; return -1;
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
get_wav_header(pb, st->codec, size); get_wav_header(pb, st->codec, size);
st->need_parsing = AVSTREAM_PARSE_FULL; st->need_parsing = AVSTREAM_PARSE_FULL;

4
libavformat/wc3movie.c
Unescape View File

@ -238,7 +238,7 @@ static int wc3_read_header(AVFormatContext *s,
/* initialize the decoder streams */ /* initialize the decoder streams */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
wc3->video_stream_index = st->index; wc3->video_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
@ -252,7 +252,7 @@ static int wc3_read_header(AVFormatContext *s,
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, 90000); av_set_pts_info(st, 33, 1, 90000);
wc3->audio_stream_index = st->index; wc3->audio_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;

6
libavformat/westwood.c
Unescape View File

@ -138,7 +138,7 @@ static int wsaud_read_header(AVFormatContext *s,
/* initialize the audio decoder stream */ /* initialize the audio decoder stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, wsaud->audio_samplerate); av_set_pts_info(st, 33, 1, wsaud->audio_samplerate);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
st->codec->codec_id = wsaud->audio_type; st->codec->codec_id = wsaud->audio_type;
@ -223,7 +223,7 @@ static int wsvqa_read_header(AVFormatContext *s,
/* initialize the video decoder stream */ /* initialize the video decoder stream */
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, VQA_FRAMERATE); av_set_pts_info(st, 33, 1, VQA_FRAMERATE);
wsvqa->video_stream_index = st->index; wsvqa->video_stream_index = st->index;
st->codec->codec_type = CODEC_TYPE_VIDEO; st->codec->codec_type = CODEC_TYPE_VIDEO;
@ -249,7 +249,7 @@ static int wsvqa_read_header(AVFormatContext *s,
if (AV_RL16(&header[24]) || (AV_RL16(&header[0]) == 1 && AV_RL16(&header[2]) == 1)) { if (AV_RL16(&header[24]) || (AV_RL16(&header[0]) == 1 && AV_RL16(&header[2]) == 1)) {
st = av_new_stream(s, 0); st = av_new_stream(s, 0);
if (!st) if (!st)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
av_set_pts_info(st, 33, 1, VQA_FRAMERATE); av_set_pts_info(st, 33, 1, VQA_FRAMERATE);
st->codec->codec_type = CODEC_TYPE_AUDIO; st->codec->codec_type = CODEC_TYPE_AUDIO;
if (AV_RL16(&header[0]) == 1) if (AV_RL16(&header[0]) == 1)

2
libavformat/wv.c
Unescape View File

@ -177,7 +177,7 @@ static int wv_read_packet(AVFormatContext *s,
} }
if(av_new_packet(pkt, wc->blksize + WV_EXTRA_SIZE) < 0) if(av_new_packet(pkt, wc->blksize + WV_EXTRA_SIZE) < 0)
return AVERROR_NOMEM; return AVERROR(ENOMEM);
memcpy(pkt->data, wc->extra, WV_EXTRA_SIZE); memcpy(pkt->data, wc->extra, WV_EXTRA_SIZE);
ret = get_buffer(&s->pb, pkt->data + WV_EXTRA_SIZE, wc->blksize); ret = get_buffer(&s->pb, pkt->data + WV_EXTRA_SIZE, wc->blksize);
if(ret != wc->blksize){ if(ret != wc->blksize){

Write Preview
Loading…
Cancel
Save