aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/sbrdsp.c
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-11-11 10:26:28 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-11-11 10:27:03 +0100
commita83af3fc33a6d858138c5ff772a01b220782eb95 (patch)
tree3b52d890d733746b83e23adf406c70af7fd011ee /libavcodec/sbrdsp.c
parent48efe9ec86acf6dcf6aabef2114f8dd04e4fbce4 (diff)
parentb776113e5d4a56759615196de98efe802e95a6b6 (diff)
downloadffmpeg-a83af3fc33a6d858138c5ff772a01b220782eb95.tar.gz
Merge commit 'b776113e5d4a56759615196de98efe802e95a6b6'
* commit 'b776113e5d4a56759615196de98efe802e95a6b6': v4l2: Unify one instance of reading/storing errno Conflicts: libavdevice/v4l2.c See: 60950adc18fe145a235211e75da68ab07123fcaa Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/sbrdsp.c')
0 files changed, 0 insertions, 0 deletions