opensource/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-08-06 07:40:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  swscale: Fix stack alignment for SSE
  avcodec: move some AVCodecContext fields to an internal struct.
  avcodec: use av_opt_set() instead of deprecated av_set_string3()
  avcodec: fix some const warnings
  avcodec: remove pointless AVOption, internal_buffer_count
  imgutils: Fix illegal read.

Conflicts:
	doc/APIchanges
	libavcodec/avcodec.h
	libavcodec/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-11-20 02:46:06 +01:00
parent 90c02ae142 09d243ddd0
commit dbb38bc389
14 changed files with 139 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
libavcodec/mimic.c
View File

@ -24,6 +24,7 @@
#include <stdint.h>
#include "avcodec.h"
#include "internal.h"
#include "get_bits.h"
#include "bytestream.h"
#include "dsputil.h"
@ -405,7 +406,8 @@ static av_cold int mimic_decode_end(AVCodecContext *avctx)
av_free(ctx->swap_buf);
if(avctx->is_copy) return 0;
if (avctx->internal->is_copy)
return 0;
for(i = 0; i < 16; i++)
if(ctx->buf_ptrs[i].data[0])