aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/swresample.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-12-05 23:06:36 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-12-05 23:07:20 +0100
commit2e59e6ff682dcc77f992758ea503f81b5fc6e858 (patch)
tree56ed1b3476d31c3650a0ec7e77ea0bed98ad47f8 /libswresample/swresample.h
parent9222a176e14847a8751e8d799799573e652550ad (diff)
parent7a38987f245e3c280d81442f207b983333b6233c (diff)
downloadffmpeg-2e59e6ff682dcc77f992758ea503f81b5fc6e858.tar.gz
Merge commit '7a38987f245e3c280d81442f207b983333b6233c'
* commit '7a38987f245e3c280d81442f207b983333b6233c': mpegvideo: free_context_frame() cannot fail, make it return void See: 94c61cd9aede4c0b57632d524a725c2dda719eb3 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswresample/swresample.h')
0 files changed, 0 insertions, 0 deletions