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

Merge commit 'bb41115d56930b9f5d59e79dca254d1201246967'

Browse Source 
* commit 'bb41115d56930b9f5d59e79dca254d1201246967':
  imgutils: Do not declare avpriv_set_systematic_pal2 in the public header

Conflicts:
	libavutil/internal.h
	libavutil/version.h

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2014-08-04 12:41:15 +02:00
parent 71d008ebe4 bb41115d56
commit 22a0249deb
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavutil/imgutils.h
View File

@@ -205,8 +205,6 @@ int av_image_check_size(unsigned int w, unsigned int h, int log_offset, void *lo
*/
int av_image_check_sar(unsigned int w, unsigned int h, AVRational sar);
int avpriv_set_systematic_pal2(uint32_t pal[256], enum AVPixelFormat pix_fmt);
/**
* @}
*/