avcodec: add a Film Grain codec property flag

James Almer committed 5 years ago

Commit 590a7e01 parent 6dd714919 files · +31 −15Browse files

Showing the changes to libavcodec (3 of 19 files). Show all

Unified · Split

3 files

libavcodec/avcodec.c +2 −0
libavcodec/avcodec.h +1 −0
libavcodec/version.h +2 −2

libavcodec/avcodec.c+2−0

@@ -658,6 +658,8 @@ void avcodec_string(char buf, int buf_size, AVCodecContext enc, int encode) · 657 unmodified lines
658	658	} else {
659	659	if (enc->properties & FF_CODEC_PROPERTY_CLOSED_CAPTIONS)
660	660	av_bprintf(&bprint, ", Closed Captions");
	661	+ if (enc->properties & FF_CODEC_PROPERTY_FILM_GRAIN)
	662	+ av_bprintf(&bprint, ", Film Grain");
661	663	if (enc->properties & FF_CODEC_PROPERTY_LOSSLESS)
662	664	av_bprintf(&bprint, ", lossless");
663	665	}

libavcodec/avcodec.h+1−0

@@ -1818,6 +1818,7 @@ typedef struct AVCodecContext { · 1817 unmodified lines
1818	1818	unsigned properties;
1819	1819	#define FF_CODEC_PROPERTY_LOSSLESS 0x00000001
1820	1820	#define FF_CODEC_PROPERTY_CLOSED_CAPTIONS 0x00000002
	1821	+#define FF_CODEC_PROPERTY_FILM_GRAIN 0x00000004
1821	1822
1822	1823	/**
1823	1824	* Additional data associated with the entire coded stream.

libavcodec/version.h+2−2

@@ -28,8 +28,8 @@ · 27 unmodified lines
28	28	#include "libavutil/version.h"
29	29
30	30	#define LIBAVCODEC_VERSION_MAJOR 59
31		−#define LIBAVCODEC_VERSION_MINOR 5
32		−#define LIBAVCODEC_VERSION_MICRO 101
	31	+#define LIBAVCODEC_VERSION_MINOR 6
	32	+#define LIBAVCODEC_VERSION_MICRO 100
33	33
34	34	#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
35	35	LIBAVCODEC_VERSION_MINOR, \