aboutsummaryrefslogtreecommitdiffstats
path: root/libavdevice/decklink_enc.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-28 01:19:28 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-28 01:19:28 +0100
commit56b84b023d705a2716a5a52948584874c8db7b05 (patch)
tree6454605aa92d2977dc339cf9c9e86200d0de69a9 /libavdevice/decklink_enc.h
parent0e216ed40789e382eb6725d1cd0941927bfd1400 (diff)
parentca78ee73db9e059f501706ba6108e23902e84933 (diff)
downloadffmpeg-56b84b023d705a2716a5a52948584874c8db7b05.tar.gz
Merge commit 'ca78ee73db9e059f501706ba6108e23902e84933' into release/2.4
* commit 'ca78ee73db9e059f501706ba6108e23902e84933': opusdec: make sure all substreams have the same number of coded samples Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavdevice/decklink_enc.h')
0 files changed, 0 insertions, 0 deletions