aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec/libmp3lame.c
diff options
context:
space:
mode:
authorMark Thompson <sw@jkqxz.net>2018-02-21 22:32:42 +0000
committerMark Thompson <sw@jkqxz.net>2018-02-21 22:37:07 +0000
commitfd76e7be70c10861567ebefd0bc6864f223fb017 (patch)
tree7256a7b42d4522f5c3f914f6e4fde45009172faa /libavcodec/libmp3lame.c
parent77eba7bd99355fc37a2bfc9d0224218f4022762c (diff)
parent69062d0f9b6aef5d9d9b8c9c9b5cfb23037caddb (diff)
downloadffmpeg-fd76e7be70c10861567ebefd0bc6864f223fb017.tar.gz
Merge commit '69062d0f9b6aef5d9d9b8c9c9b5cfb23037caddb'
* commit '69062d0f9b6aef5d9d9b8c9c9b5cfb23037caddb': h264_metadata: Use common SEI addition function Minor changes because the following patch is already present. Merged-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'libavcodec/libmp3lame.c')
0 files changed, 0 insertions, 0 deletions