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

Merge remote-tracking branch 'qatar/master'

Browse Source 
* qatar/master:
  avutil: Do not make ff_ symbols globally visible.
  avutil: Rename ff_set_systematic_pal2() ---> avpriv_set_systematic_pal2()
  build: tms470: work around glibc math.h problems
  configure: improve tms470 compiler usage with glibc

Conflicts:
	libavcodec/bmpenc.c
	libavcodec/rawdec.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2012-10-14 15:11:34 +02:00
parent de3b1116da 7638f0b2fe
commit d6f6a7557c
9 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/utils.c
View File

@@ -544,7 +544,7 @@ static int video_get_buffer(AVCodecContext *s, AVFrame *pic)
buf->linesize[i] = 0;
}
if (size[1] && !size[2])
ff_set_systematic_pal2((uint32_t *)buf->data[1], s->pix_fmt);
avpriv_set_systematic_pal2((uint32_t *)buf->data[1], s->pix_fmt);
buf->width = s->width;
buf->height = s->height;
buf->pix_fmt = s->pix_fmt;