summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2012-11-26 04:47:29 +0200
committerwm4 <wm4@nowhere>2012-12-03 21:08:52 +0100
commit77eac2ec3494080f1dfbc1fd55ff6aba7effd466 (patch)
tree69aa3334412c84ee1773f6c59041e5dcdf5f31c0 /stream
parenta75e65db5defc59a8fca0024bf6559b8b6c0f1ea (diff)
downloadmpv-77eac2ec3494080f1dfbc1fd55ff6aba7effd466.tar.bz2
mpv-77eac2ec3494080f1dfbc1fd55ff6aba7effd466.tar.xz
audio: improve decoder open failure handling
Reinitialize sh_audio->samplesize and sample_format before falling back to another audio decoder (some decoders rely on default values). Remove code setting these fields from demux_mkv and demux_lavf (no decoder should depend on demuxer-set values for these fields). Conflicts: audio/decode/ad_lavc.c Merged from mplayer2 commit 6b9567. The changes to ad_lavc.c are not merged, as they are very specific to the mplayer2 libavresample hack; we deplanarize manually, so we can't get unsupported sample formats yet (except on raw audio with "pcm_f64le", as we don't support AV_SAMPLE_FMT_DBL in the audio chain).
Diffstat (limited to 'stream')
0 files changed, 0 insertions, 0 deletions