Stowage/ffmpeg
2
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-12-08 06:09:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge commit 'bb41115d56'

Browse source 
* commit 'bb41115d56':
  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
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);
/**
* @}
*/