eessppeelllloo/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-12 10:00:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  APIchanges: fill in revision for AVFrame.age deprecation
  avcodec: deprecate AVFrame.age
  4xm: remove unneeded check for remaining unused data.
  lavf: force threads to 1 in avformat_find_stream_info()
  swscale: fix overflows in vertical scaling at top/bottom edges.
  lavf: add OpenMG audio muxer.
  omadec: split data that will be used in the muxer to a separate file.
  lavf: rename oma.c -> omadec.c
  tmv decoder: set correct pix_fmt

Conflicts:
	Changelog
	doc/APIchanges
	libavcodec/mpegvideo.c
	libavcodec/version.h
	libavformat/oma.c
	libavformat/version.h
	libswscale/swscale.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2011-12-19 02:11:50 +01:00
parent f371396dfb 2a216ca2ef
commit 7c29313b38
21 changed files with 640 additions and 528 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libavcodec/utils.c
View File

@@ -373,7 +373,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
int w= s->width;
int h= s->height;
InternalBuffer *buf;
int *picture_number;
AVCodecInternal *avci = s->internal;
if(pic->data[0]!=NULL) {
@@ -394,8 +393,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
}
buf = &avci->buffer[avci->buffer_count];
picture_number = &(avci->buffer[INTERNAL_BUFFER_SIZE]).last_pic_num; //FIXME ugly hack
(*picture_number)++;
if(buf->base[0] && (buf->width != w || buf->height != h || buf->pix_fmt != s->pix_fmt)){
if(s->active_thread_type&FF_THREAD_FRAME) {
@@ -409,10 +406,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
}
}
if(buf->base[0]){
pic->age= *picture_number - buf->last_pic_num;
buf->last_pic_num= *picture_number;
}else{
if (!buf->base[0]) {
int h_chroma_shift, v_chroma_shift;
int size[4] = {0};
int tmpsize;
@@ -451,7 +445,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
size[i] = picture.data[i+1] - picture.data[i];
size[i] = tmpsize - (picture.data[i] - picture.data[0]);
buf->last_pic_num= -256*256*256*64;
memset(buf->base, 0, sizeof(buf->base));
memset(buf->data, 0, sizeof(buf->data));
@@ -480,7 +473,6 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
buf->width = s->width;
buf->height = s->height;
buf->pix_fmt= s->pix_fmt;
pic->age= 256*256*256*64;
}
pic->type= FF_BUFFER_TYPE_INTERNAL;