generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master: (22 commits)
  frwu: Employ more meaningful return values.
  fraps: Use av_fast_padded_malloc() instead of av_realloc()
  mjpegdec: use av_fast_padded_malloc()
  eatqi: use av_fast_padded_malloc()
  asv1: use av_fast_padded_malloc()
  avcodec: Add av_fast_padded_malloc().
  swscale: enable dithering in MMX functions.
  swscale: make rgb24 function macros slightly smaller.
  avcodec.h: Remove some disabled cruft.
  swscale: remove obsolete comment.
  swscale-test: Drop unused argc and argv arguments from main().
  zmbv: Employ more meaningful return values.
  zmbvenc: Employ more meaningful return values.
  vc1: prevent null pointer dereference on broken files
  zmbv: check av_realloc() return values and avoid memleaks on ENOMEM
  truespeech: align buffer
  ac3: Do not read past the end of ff_ac3_band_start_tab.
  dv: Fix small stack overread related to CVE-2011-3929 and CVE-2011-3936.
  dv: Fix null pointer dereference due to ach=0
  dv: check stype
  ...

Conflicts:
	doc/APIchanges
	libavcodec/asv1.c
	libavcodec/avcodec.h
	libavcodec/eatqi.c
	libavcodec/fraps.c
	libavcodec/frwu.c
	libavcodec/zmbv.c
	libavformat/dv.c
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-02-02 02:02:18 +01:00
parent 5cd8afee99 5ff88020ac
commit 4c677df27c
19 changed files with 122 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
libavcodec/utils.c
View File

@@ -91,7 +91,7 @@ void av_fast_padded_malloc(void *ptr, unsigned int *size, size_t min_size)
{
uint8_t **p = ptr;
if (min_size > SIZE_MAX - FF_INPUT_BUFFER_PADDING_SIZE) {
*p = NULL;
av_freep(p);
*size = 0;
return;
}
@@ -1448,9 +1448,9 @@ av_cold int avcodec_close(AVCodecContext *avctx)
static enum CodecID remap_deprecated_codec_id(enum CodecID id)
{
switch(id){
case CODEC_ID_G723_1_DEPRECATED : return CODEC_ID_G723_1;
case CODEC_ID_G729_DEPRECATED : return CODEC_ID_G729;
case CODEC_ID_UTVIDEO_DEPRECATED: return CODEC_ID_UTVIDEO;
//This is for future deprecatec codec ids, its empty since
//last major bump but will fill up again over time, please dont remove it
// case CODEC_ID_UTVIDEO_DEPRECATED: return CODEC_ID_UTVIDEO;
default : return id;
}
}