diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:21:30 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-10 01:29:24 +0200 |
| commit | 287602f9d80f4a816c0e9a3a9c0d810de8dc94cb (patch) | |
| tree | 06bd62c1fe2e58ca1bd2578fe5effe60e60f9a28 /libavutil/frame.h | |
| parent | 97f8c7a03eddacd9b6450423cc21a801e002f01f (diff) | |
| parent | 472f9ed312ec784f7c72876b77163f4741880d05 (diff) | |
| download | ffmpeg-287602f9d80f4a816c0e9a3a9c0d810de8dc94cb.tar.gz | |
Merge commit '472f9ed312ec784f7c72876b77163f4741880d05'
* commit '472f9ed312ec784f7c72876b77163f4741880d05':
Remove obsolete FF_API_AVFRAME_COLORSPACE cruft.
Conflicts:
libavcodec/utils.c
libavutil/frame.h
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/frame.h')
| -rw-r--r-- | libavutil/frame.h | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libavutil/frame.h b/libavutil/frame.h index 6ff372749a..dbbdd29d1b 100644 --- a/libavutil/frame.h +++ b/libavutil/frame.h @@ -446,7 +446,6 @@ typedef struct AVFrame { */ int flags; -#if FF_API_AVFRAME_COLORSPACE /** * MPEG vs JPEG YUV range. * It must be accessed using av_frame_get_color_range() and @@ -470,7 +469,6 @@ typedef struct AVFrame { enum AVColorSpace colorspace; enum AVChromaLocation chroma_location; -#endif /** * frame timestamp estimated using various heuristics, in stream time base |