diff options
| author | wm4 <wm4@nowhere> | 2016-03-31 22:00:45 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2016-03-31 22:00:45 +0200 |
| commit | c971220cdd360b56efc0e67536bdf19501477aa4 (patch) | |
| tree | 74ffd570b80306725898d81e705e09b3a4dfdb8d /demux/stheader.h | |
| parent | 38c813c919a2c7d59d6113f16252aa3be96f3fca (diff) | |
| download | mpv-c971220cdd360b56efc0e67536bdf19501477aa4.tar.bz2 mpv-c971220cdd360b56efc0e67536bdf19501477aa4.tar.xz | |
demux_lavf, ad_lavc, ad_spdif, vd_lavc: handle FFmpeg codecpar API change
AVFormatContext.codec is deprecated now, and you're supposed to use
AVFormatContext.codecpar instead.
Handle this for all of the normal playback code.
Encoding mode isn't touched.
Diffstat (limited to 'demux/stheader.h')
| -rw-r--r-- | demux/stheader.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/demux/stheader.h b/demux/stheader.h index 35be20885a..77d0eb1da3 100644 --- a/demux/stheader.h +++ b/demux/stheader.h @@ -68,7 +68,9 @@ struct mp_codec_params { int extradata_size; // Codec specific header data (set by demux_lavf.c only) + // Which one is in use depends on HAVE_AVCODEC_HAS_CODECPAR. struct AVCodecContext *lav_headers; + struct AVCodecParameters *lav_codecpar; // STREAM_AUDIO int samplerate; |