diff options
| author | Uoti Urpala <uau@mplayer2.org> | 2011-06-26 00:46:40 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@mplayer2.org> | 2011-06-26 06:27:50 +0300 |
| commit | d3bef0286bc0688da91452f6e07429052d324b51 (patch) | |
| tree | b64a16aa7754a5299fbee3e71018ab5d3a5a7f3c /libmpdemux | |
| parent | aba8a1838aa882dace748a7402caf3087dc1f25f (diff) | |
| download | mpv-d3bef0286bc0688da91452f6e07429052d324b51.tar.bz2 mpv-d3bef0286bc0688da91452f6e07429052d324b51.tar.xz | |
vd_ffmpeg: autoselect output colorspaces without codecs.conf
Selecting the colorspace to output from a decoder is done in the
function mpcodecs_config_vo(). Add a new version of this function,
mpcodecs_config_vo2(), that allows the decoder to specify a list of
candidate colorspaces instead of always using a hardcoded list
specified in the codecs.conf entry. If the codecs.conf entry has any
"out" lines then those still take priority and the decoder-provided
list (if any) is ignored. Make vd_ffmpeg provide a list of the
colorspaces it's willing to output. Remove "out" lines from most
entries for libavcodec video decoders in codecs.conf, so that the
automatic values are now used instead.
Diffstat (limited to 'libmpdemux')
| -rw-r--r-- | libmpdemux/stheader.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h index f67a3217ac..ce4db94035 100644 --- a/libmpdemux/stheader.h +++ b/libmpdemux/stheader.h @@ -119,6 +119,7 @@ typedef struct sh_video { int i_bps; // == bitrate (compressed bytes/sec) int disp_w,disp_h; // display size (filled by fileformat parser) // output driver/filters: (set by libmpcodecs core) + unsigned int outfmt; unsigned int outfmtidx; struct vf_instance *vfilter; // the video filter chain, used for this video stream int output_flags; // query_format() results for output filters+vo |