diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:52:45 +0000 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-02-16 16:54:12 +0000 |
| commit | 3f462fcf76bb99bc2cb14575eaa7a020595ca277 (patch) | |
| tree | 053f490b72718aa4c6a0fd8051251eb9a4f10d24 /libavutil/pixdesc.c | |
| parent | c63da6e91630b72fa5916314910cb35e82331f70 (diff) | |
| parent | 1546a41adae818b340acdd9b5dacd6d0a92b6507 (diff) | |
| download | ffmpeg-3f462fcf76bb99bc2cb14575eaa7a020595ca277.tar.gz | |
Merge commit '1546a41adae818b340acdd9b5dacd6d0a92b6507'
* commit '1546a41adae818b340acdd9b5dacd6d0a92b6507':
pixdesc: Drop unneeded deprecation warning guards
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavutil/pixdesc.c')
| -rw-r--r-- | libavutil/pixdesc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/pixdesc.c b/libavutil/pixdesc.c index 58833cfb8e..2bca44062f 100644 --- a/libavutil/pixdesc.c +++ b/libavutil/pixdesc.c @@ -2061,7 +2061,6 @@ static const char *chroma_location_names[AVCHROMA_LOC_NB] = { "top", "bottomleft", "bottom", }; -FF_DISABLE_DEPRECATION_WARNINGS static enum AVPixelFormat get_pix_fmt_internal(const char *name) { enum AVPixelFormat pix_fmt; @@ -2249,7 +2248,6 @@ void ff_check_pixfmt_descriptors(void){ } } } -FF_ENABLE_DEPRECATION_WARNINGS enum AVPixelFormat av_pix_fmt_swap_endianness(enum AVPixelFormat pix_fmt) |