aboutsummaryrefslogtreecommitdiffstats
path: root/LICENSE
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-02-28 22:39:54 +0100
committerMichael Niedermayer <michaelni@gmx.at>2014-02-28 22:40:58 +0100
commitd46c3b8171b30e757f1f80f88e5b8ceda9a48831 (patch)
tree69c8ed6e6a1e68f73a897c66e0c3294a7da2554e /LICENSE
parentfe6603745e930655ab8668037f7c43f9c5858c82 (diff)
parent3aca10bf762a94d7de555cedf1ff0e4f6792bf41 (diff)
downloadffmpeg-d46c3b8171b30e757f1f80f88e5b8ceda9a48831.tar.gz
Merge remote-tracking branch 'qatar/master'
* qatar/master: latm: Always reconfigure if no extradata was set previously See: d039b6074ca68da9b6dc88d8bb40056fee9fecb6 Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'LICENSE')
0 files changed, 0 insertions, 0 deletions