From: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Date: Sun, 10 Apr 2016 20:48:24 +0000 (+0100)
Subject: Merge commit '0705f5960c9d272cef1309c090000865b991c9c7'
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=bc91bc1d8b2baa29267b5181d805f5286466cade;p=ffmpeg

Merge commit '0705f5960c9d272cef1309c090000865b991c9c7'

This commit is a no-op. We did this already in 9e0d1c00b5832e80dc11368e3d39f9e2ec9346f1.

* commit '0705f5960c9d272cef1309c090000865b991c9c7':
  avplay: do not use AVStream.codec for decoding

Merged-by: Derek Buitenhuis <derek.butienhuis@gmail.com>
---

bc91bc1d8b2baa29267b5181d805f5286466cade