aboutsummaryrefslogtreecommitdiffstats
path: root/libavutil/x86
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-10 20:34:14 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-10 20:38:51 +0200
commitfc6aa304596bba3837e1026fe1fb6abba1295ab5 (patch)
treed2f57d8321b1fe97234be0258eee47a41de01e6f /libavutil/x86
parentcb530dda7d76790b08ee3b7f67e251f3ce48c359 (diff)
parenteb4f9069002e73648f6640cd054fc814cfda75b8 (diff)
downloadffmpeg-fc6aa304596bba3837e1026fe1fb6abba1295ab5.tar.gz
Merge commit 'eb4f9069002e73648f6640cd054fc814cfda75b8'
* commit 'eb4f9069002e73648f6640cd054fc814cfda75b8': lavf: More informative error message Conflicts: libavformat/mux.c See: 30ced7e69f434bd49b39fb7c8ce02d9ba71babfc Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavutil/x86')
0 files changed, 0 insertions, 0 deletions